This commit was manufactured by cvs2svn to create tagcfg-merge-20021206

'cfg-merge-20021206'.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/tags/cfg-merge-20021206@54531 138bc75d-0d04-0410-961f-82ee72b054a4

21 files changed, 0 insertions, 587 deletions

diff --git a/gcc/config/i386/scodbx.h b/gcc/config/i386/scodbx.h
deleted file mode 100644
index 7da93053256..00000000000
--- a/gcc/config/i386/scodbx.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Definitions for Intel 386 running SCO Unix System V,
-   using dbx-in-coff encapsulation.
-   Copyright (C) 1992, 1995, 1996, 1999 Free Software Foundation, Inc.
-
-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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include "i386/svr3dbx.h"
-
-/* Overridden defines for SCO systems from sco.h. */
-
-/* By default, target has a 80387, uses IEEE compatible arithmetic,
-   and returns float values in the 387, ie,
-   (TARGET_80387 | TARGET_FLOAT_RETURNS_IN_80387)
-
-   SCO's software emulation of a 387 fails to handle the `fucomp'
-   opcode.  fucomp is only used when generating IEEE compliant code.
-   So don't make TARGET_IEEE_FP default for SCO. */
-
-#undef TARGET_SUBTARGET_DEFAULT
-#define TARGET_SUBTARGET_DEFAULT (MASK_80387 | MASK_FLOAT_RETURNS)
-
-/* Use crt1.o as a startup file and crtn.o as a closing file.  */
-
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC \
-  "%{!r:%{!z:svr3.ifile%s}%{z:svr3z.ifile%s}}\
-   %{pg:gcrt1.o%s}%{!pg:%{p:mcrt1.o%s}%{!p:crt1.o%s}}"
-
-/* Library spec, including SCO international language support. */
-
-#undef LIB_SPEC
-#define LIB_SPEC \
- "%{p:-L/usr/lib/libp}%{pg:-L/usr/lib/libp} %{scointl:libintl.a%s} -lc"
-
-/* Specify predefined symbols in preprocessor.  */
-
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem=svr3"
-
-#undef CPP_SPEC
-#define CPP_SPEC "%(cpp_cpu) %{scointl:-DM_INTERNAT}"
-
-/* This spec is used for telling cpp whether char is signed or not.  */
-
-#undef SIGNED_CHAR_SPEC
-#if DEFAULT_SIGNED_CHAR
-#define SIGNED_CHAR_SPEC \
- "%{funsigned-char:-D__CHAR_UNSIGNED__ -D_CHAR_UNSIGNED}"
-#else
-#define SIGNED_CHAR_SPEC \
- "%{!fsigned-char:-D__CHAR_UNSIGNED__ -D_CHAR_UNSIGNED}"
-#endif
-
-/* caller has to pop the extra argument passed to functions that return
-   structures. */
-
-#undef RETURN_POPS_ARGS
-#define RETURN_POPS_ARGS(FUNDECL,FUNTYPE,SIZE)   \
-  ((FUNDECL) && TREE_CODE (FUNDECL) == IDENTIFIER_NODE ? 0	\
-   : (TARGET_RTD						\
-      && (TYPE_ARG_TYPES (FUNTYPE) == 0				\
-	  || (TREE_VALUE (tree_last (TYPE_ARG_TYPES (FUNTYPE)))	\
-	      == void_type_node))) ? (SIZE)			\
-   : 0)
-/* On other 386 systems, the last line looks like this:
-   : (aggregate_value_p (TREE_TYPE (FUNTYPE))) ? GET_MODE_SIZE (Pmode) : 0)  */
-
-/* Handle #pragma pack. */
-#define HANDLE_SYSV_PRAGMA
diff --git a/gcc/config/i386/xm-dgux.h b/gcc/config/i386/xm-dgux.h
deleted file mode 100644
index 881c5c7be9d..00000000000
--- a/gcc/config/i386/xm-dgux.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Configuration for GCC for Intel i386 running DG/ux */
-
-/* looks just like sysv4 for now */
-#include "xm-svr4.h"
diff --git a/gcc/config/i386/xm-sun.h b/gcc/config/i386/xm-sun.h
deleted file mode 100644
index 6c0f0a25630..00000000000
--- a/gcc/config/i386/xm-sun.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Configuration for GNU C-compiler for Intel 80386 running SunOS 4.0.
-   Copyright (C) 1988, 1997 Free Software Foundation, Inc.
-
-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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define USG
diff --git a/gcc/config/i386/xm-sysv3.h b/gcc/config/i386/xm-sysv3.h
deleted file mode 100644
index 9a655443ff5..00000000000
--- a/gcc/config/i386/xm-sysv3.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Configuration for GCC for Intel i386 running System V Release 3.  */
-
-#include "xm-svr3.h"
diff --git a/gcc/testsuite/g++.dg/tls/diag-1.C b/gcc/testsuite/g++.dg/tls/diag-1.C
deleted file mode 100644
index 697d0b13106..00000000000
--- a/gcc/testsuite/g++.dg/tls/diag-1.C
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Valid __thread specifiers.  */
-
-__thread int g1;
-extern __thread int g2;
-static __thread int g3;
-
-void foo()
-{
-  extern __thread int l1;
-  static __thread int l2;
-}
-
-struct A {
-  static __thread int i;
-};
-
-__thread int A::i = 42;
-
-template <typename T> struct B {
-  static __thread T t;
-};
-
-template <typename T>
-__thread T B<T>::t = 42;
-
-void bar ()
-{
-  int j = B<int>::t;
-  int k = B<const int>::t;
-}
diff --git a/gcc/testsuite/g++.dg/tls/diag-2.C b/gcc/testsuite/g++.dg/tls/diag-2.C
deleted file mode 100644
index 6365406e2e7..00000000000
--- a/gcc/testsuite/g++.dg/tls/diag-2.C
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Invalid __thread specifiers.  */
-
-__thread extern int g1;		/* { dg-error "`__thread' before `extern'" } */
-__thread static int g2;		/* { dg-error "`__thread' before `static'" } */
-__thread __thread int g3;	/* { dg-error "duplicate `__thread'" } */
-typedef __thread int g4;	/* { dg-error "multiple storage classes" } */
-
-void foo()
-{
-  __thread int l1;		/* { dg-error "implicitly auto and declared `__thread'" } */
-  auto __thread int l2;		/* { dg-error "multiple storage classes" } */
-  __thread extern int l3;	/* { dg-error "`__thread' before `extern'" } */
-  register __thread int l4;	/* { dg-error "multiple storage classes" } */
-}
-
-__thread void f1 ();		/* { dg-error "invalid for function" } */
-extern __thread void f2 ();	/* { dg-error "invalid for function" } */
-static __thread void f3 ();	/* { dg-error "invalid for function" } */
-__thread void f4 () { }		/* { dg-error "invalid for function" } */
-
-void bar(__thread int p1);	/* { dg-error "(invalid in parameter)|(specified for parameter)" } */
-
-struct A {
-  __thread int i;		/* { dg-error "specified for field" } */
-};
diff --git a/gcc/testsuite/g++.dg/tls/init-1.C b/gcc/testsuite/g++.dg/tls/init-1.C
deleted file mode 100644
index 74f7641fe27..00000000000
--- a/gcc/testsuite/g++.dg/tls/init-1.C
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Valid initializations.  */
-
-__thread int i = 42;
-
-static int j;
-__thread int *p = &j;
-
-/* Note that this is valid in C++ (unlike C) as a run-time initialization.  */
-int *q = &i;
-
-/* Valid because "const int k" is an integral constant expression in C++.  */
-__thread const int k = 42;
-__thread const int l = k;
diff --git a/gcc/testsuite/g++.dg/tls/init-2.C b/gcc/testsuite/g++.dg/tls/init-2.C
deleted file mode 100644
index 49df50147b3..00000000000
--- a/gcc/testsuite/g++.dg/tls/init-2.C
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Invalid initializations.  */
-
-extern __thread int i;
-__thread int *p = &i;	/* { dg-error "run-time initialization" } */
-
-extern int f();
-__thread int j = f();	/* { dg-error "run-time initialization" } */
-
-struct S
-{
-  S();
-};
-__thread S s;		/* { dg-error "run-time initialization" } */
diff --git a/gcc/testsuite/g++.dg/tls/tls.exp b/gcc/testsuite/g++.dg/tls/tls.exp
deleted file mode 100644
index a00dad79dce..00000000000
--- a/gcc/testsuite/g++.dg/tls/tls.exp
+++ /dev/null
@@ -1,44 +0,0 @@
-#   Copyright (C) 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 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.  
-
-# GCC testsuite that uses the `dg.exp' driver.
-
-# Load support procs.
-load_lib g++-dg.exp
-
-# Test for thread-local data supported by the platform.  If it
-# isn't, everything will fail with the "not supported" message.
-
-set comp_output [g++_target_compile \
-		"$srcdir/$subdir/trivial.C" "trivial.S" assembly ""]
-if { [string match "*not supported*" $comp_output] } {
-  return 0
-}
-
-# If a testcase doesn't have special options, use these.
-global DEFAULT_CXXFLAGS
-if ![info exists DEFAULT_CXXFLAGS] then {
-    set DEFAULT_CXXFLAGS " -ansi -pedantic-errors -Wno-long-long"
-}
-
-# Initialize `dg'.
-dg-init
-
-# Main loop.
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" $DEFAULT_CXXFLAGS
-
-# All done.
-dg-finish
diff --git a/gcc/testsuite/g++.dg/tls/trivial.C b/gcc/testsuite/g++.dg/tls/trivial.C
deleted file mode 100644
index 1fd70631f33..00000000000
--- a/gcc/testsuite/g++.dg/tls/trivial.C
+++ /dev/null
@@ -1 +0,0 @@
-__thread int i;
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb42.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb42.C
deleted file mode 100644
index c27aa8d2df7..00000000000
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb42.C
+++ /dev/null
@@ -1,19 +0,0 @@
-//Build don't link:
-#include <vector>
-#include <algorithm>
-
-template <class T> class Expr
-{
-public :
-Expr(){};
-Expr(const T&){};
-};
-
-template <class T >
-inline bool compare(const Expr<T> a, const Expr<T> b){ return true; };
-
-int main()
-{
-  std::vector<int>     a(3);
-  std::sort( a.begin(), a.end(), compare ); // ERROR - no matching function 
-}
diff --git a/gcc/testsuite/gcc.dg/tls/diag-1.c b/gcc/testsuite/gcc.dg/tls/diag-1.c
deleted file mode 100644
index ae4f3d4a3c2..00000000000
--- a/gcc/testsuite/gcc.dg/tls/diag-1.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Valid __thread specifiers.  */
-
-__thread int g1;
-extern __thread int g2;
-static __thread int g3;
-
-void foo()
-{
-  extern __thread int l1;
-  static __thread int l2;
-}
diff --git a/gcc/testsuite/gcc.dg/tls/diag-2.c b/gcc/testsuite/gcc.dg/tls/diag-2.c
deleted file mode 100644
index 4f2b90b8f7e..00000000000
--- a/gcc/testsuite/gcc.dg/tls/diag-2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Invalid __thread specifiers.  */
-
-__thread extern int g1;		/* { dg-error "`__thread' before `extern'" } */
-__thread static int g2;		/* { dg-error "`__thread' before `static'" } */
-__thread __thread int g3;	/* { dg-error "duplicate `__thread'" } */
-typedef __thread int g4;	/* { dg-error "multiple storage classes" } */
-
-void foo()
-{
-  __thread int l1;		/* { dg-error "implicitly auto and declared `__thread'" } */
-  auto __thread int l2;		/* { dg-error "multiple storage classes" } */
-  __thread extern int l3;	/* { dg-error "`__thread' before `extern'" } */
-  register __thread int l4;	/* { dg-error "multiple storage classes" } */
-}
-
-__thread void f1 ();		/* { dg-error "invalid storage class for function" } */
-extern __thread void f2 ();	/* { dg-error "invalid storage class for function" } */
-static __thread void f3 ();	/* { dg-error "invalid storage class for function" } */
-__thread void f4 () { }		/* { dg-error "function definition declared `__thread'" } */
-
-void bar(__thread int p1);	/* { dg-error "storage class specified for parameter" } */
diff --git a/gcc/testsuite/gcc.dg/tls/init-1.c b/gcc/testsuite/gcc.dg/tls/init-1.c
deleted file mode 100644
index 97258643bf2..00000000000
--- a/gcc/testsuite/gcc.dg/tls/init-1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Invalid initializations.  */
-
-extern __thread int i;
-int *p = &i;	/* { dg-error "initializer element is not constant" } */
diff --git a/gcc/testsuite/gcc.dg/tls/section-1.c b/gcc/testsuite/gcc.dg/tls/section-1.c
deleted file mode 100644
index 741eadba536..00000000000
--- a/gcc/testsuite/gcc.dg/tls/section-1.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Verify that we get errors for trying to put TLS data in 
-   sections which can't work.  */
-
-#define A(X)	__attribute__((section(X)))
-
-__thread int i A("foo");		/* Ok */
-
-__thread int j A(".data");  /* { dg-error "causes a section type conflict" "conflict with .data section" { xfail *-*-* } } */
-
-int k A("bar");
-__thread int l A("bar");  /* { dg-error "causes a section type conflict" "conflict with user-defined section" } */
diff --git a/gcc/testsuite/gcc.dg/tls/tls.exp b/gcc/testsuite/gcc.dg/tls/tls.exp
deleted file mode 100644
index 4c2627dbcf8..00000000000
--- a/gcc/testsuite/gcc.dg/tls/tls.exp
+++ /dev/null
@@ -1,45 +0,0 @@
-#   Copyright (C) 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 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.  
-
-# GCC testsuite that uses the `dg.exp' driver.
-
-# Load support procs.
-load_lib gcc-dg.exp
-
-# Test for thread-local data supported by the platform.  If it
-# isn't, everything will fail with the "not supported" message.
-
-set comp_output [gcc_target_compile \
-		"$srcdir/$subdir/trivial.c" "trivial.S" assembly ""]
-if { [string match "*not supported*" $comp_output] } {
-  return 0
-}
-
-# If a testcase doesn't have special options, use these.
-global DEFAULT_CFLAGS
-if ![info exists DEFAULT_CFLAGS] then {
-    set DEFAULT_CFLAGS " -ansi -pedantic-errors"
-}
-
-# Initialize `dg'.
-dg-init
-
-# Main loop.
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \
-        "" $DEFAULT_CFLAGS
-
-# All done.
-dg-finish
diff --git a/gcc/testsuite/gcc.dg/tls/trivial.c b/gcc/testsuite/gcc.dg/tls/trivial.c
deleted file mode 100644
index 1fd70631f33..00000000000
--- a/gcc/testsuite/gcc.dg/tls/trivial.c
+++ /dev/null
@@ -1 +0,0 @@
-__thread int i;
diff --git a/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_base.h b/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_base.h
deleted file mode 100644
index 3d4800bb551..00000000000
--- a/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_base.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-  
-// Information as gleaned from /usr/include/ctype.h.
-  
-  struct ctype_base
-  {
-    // Non-standard typedefs.
-    typedef const unsigned char*	__to_type;
-
-    // NB: Offsets into ctype<char>::_M_table force a particular size
-    // on the mask type. Because of this, we don't use an enum.
-    typedef short		mask;
-    static const mask upper    	= _UP;
-    static const mask lower 	= _LO;
-    static const mask alpha 	= _LO | _UP | _XA;
-    static const mask digit 	= _DI;
-    static const mask xdigit 	= _XD;
-    static const mask space 	= _CN | _SP | _XS;
-    static const mask print 	= _DI | _LO | _PU | _SP | _UP | _XA;
-    static const mask graph 	= _DI | _LO | _PU | _UP | _XA;
-    static const mask cntrl 	= _BB;
-    static const mask punct 	= _PU;
-    static const mask alnum 	= _DI | _LO | _UP | _XA;
-  };
diff --git a/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_inline.h b/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_inline.h
deleted file mode 100644
index 24e01599672..00000000000
--- a/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_inline.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-  
-// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
-// functions go in ctype.cc
-  
-  bool
-  ctype<char>::
-  is(mask __m, char __c) const
-  { return _M_table[(unsigned char)(__c)] & __m; }
-
-  const char*
-  ctype<char>::
-  is(const char* __low, const char* __high, mask* __vec) const
-  {
-    while (__low < __high)
-      *__vec++ = _M_table[*__low++];
-    return __high;
-  }
-
-  const char*
-  ctype<char>::
-  scan_is(mask __m, const char* __low, const char* __high) const
-  {
-    while (__low < __high && !this->is(__m, *__low))
-      ++__low;
-    return __low;
-  }
-
-  const char*
-  ctype<char>::
-  scan_not(mask __m, const char* __low, const char* __high) const
-  {
-    while (__low < __high && this->is(__m, *__low) != 0)
-      ++__low;
-    return __low;
-  }
diff --git a/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_noninline.h b/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_noninline.h
deleted file mode 100644
index cf34bd422da..00000000000
--- a/libstdc++-v3/config/os/qnx/qnx6.1/bits/ctype_noninline.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-  
-// Information as gleaned from /usr/include/ctype.h
-  
-  const ctype_base::mask*
-  ctype<char>::classic_table() throw()
-  { return 0; }
-
-  ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
-		     size_t __refs) 
-  : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
-  _M_toupper(NULL), _M_tolower(NULL), _M_table(__table ? __table : _Ctype)
-  { }
-
-  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
-  : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
-  _M_toupper(NULL), _M_tolower(NULL), _M_table(__table ? __table : _Ctype)
-  { }
-
-  char
-  ctype<char>::do_toupper(char __c) const
-  { return ::toupper((int) __c); }
-
-  const char*
-  ctype<char>::do_toupper(char* __low, const char* __high) const
-  {
-    while (__low < __high)
-      {
-	*__low = ::toupper((int) *__low);
-	++__low;
-      }
-    return __high;
-  }
-
-  char
-  ctype<char>::do_tolower(char __c) const
-  { return ::tolower((int) __c); }
-
-  const char* 
-  ctype<char>::do_tolower(char* __low, const char* __high) const
-  {
-    while (__low < __high)
-      {
-	*__low = ::tolower((int) *__low);
-	++__low;
-      }
-    return __high;
-  }
diff --git a/libstdc++-v3/config/os/qnx/qnx6.1/bits/os_defines.h b/libstdc++-v3/config/os/qnx/qnx6.1/bits/os_defines.h
deleted file mode 100644
index 23cf0976c08..00000000000
--- a/libstdc++-v3/config/os/qnx/qnx6.1/bits/os_defines.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Specific definitions for QNX 6.1  -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
-
-// System-specific #define, typedefs, corrections, etc, go here.  This
-// file will come before all others.
-
-#endif