gcc:

	* config.build (alpha*-dec-osf4*): Remove.
	* config.gcc: Remove alpha*-dec-osf4*, alpha-dec-osf5.0* from list
	of obsolete configurations.
	(alpha*-dec-osf[45]*): Remove alpha*-dec-osf4*, alpha-dec-osf5.0*
	support.
	* config/alpha/t-osf4: Renamed to ...
	* config/alpha/t-osf5: ... this.
	* config/alpha/osf.h: Renamed to ...
	* config/alpha/osf5.h: ... this.
	Merged old osf5.h contents.
	Update comments.
	(ASM_SPEC): Use ASM_OLDAS_SPEC directly.
	(EXTRA_SPECS): Removed.
	* doc/install.texi (Specific, alpha*-dec-osf5.1): Renamed to
	reflect removal of Tru64 UNIX V4.0/V5.0 support.
	Document that.

	fixincludes:
	* inclhack.def (alpha_wchar): Remove.
	* fixincl.x: Regenerate.
	* tests/base/wchar.h: Remove.

	libgcc:
	* config.host (alpha*-dec-osf[45]*): Removed alpha*-dec-osf4*,
	alpha-dec-osf5.0* support.


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

4 files changed, 11 insertions, 84 deletions

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index ee1087058d4..b0b26dfe3fd 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* inclhack.def (alpha_wchar): Remove.
+	* fixincl.x: Regenerate.
+	* tests/base/wchar.h: Remove.
+
 2010-04-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* aclocal.m4: Regenerate.
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index d66766cea2e..e80d50c5adc 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Tuesday March 30, 2010 at 09:51:20 PM MEST
+ * It has been AutoGen-ed  Wednesday April  7, 2010 at 05:11:50 PM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Mar 30 21:51:20 MEST 2010
+/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Apr  7 17:11:50 MEST 2010
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 206 fixup descriptions.
+ * This file contains 205 fixup descriptions.
  *
  * See README for more information.
  *
@@ -1354,43 +1354,6 @@ static const char* apzAlpha_SbrkPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Wchar fix
- */
-tSCC zAlpha_WcharName[] =
-     "alpha_wchar";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_WcharList[] =
-  "wchar.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha_WcharMachs[] = {
-        "alpha*-dec-osf4*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_WcharSelect0[] =
-       "#define wcstok wcstok_r";
-
-#define    ALPHA_WCHAR_TEST_CT  1
-static tTestDesc aAlpha_WcharTests[] = {
-  { TT_EGREP,    zAlpha_WcharSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Wchar
- */
-static const char* apzAlpha_WcharPatch[] = { sed_cmd_z,
-    "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@",
-    "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t   wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Avoid_Bool_Define fix
  */
 tSCC zAvoid_Bool_DefineName[] =
@@ -8395,9 +8358,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          246
+#define REGEX_COUNT          245
 #define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            206
+#define FIX_COUNT            205
 
 /*
  *  Enumerate the fixes
@@ -8434,7 +8397,6 @@ typedef enum {
     ALPHA_PTHREAD_GCC_FIXIDX,
     ALPHA_PTHREAD_INIT_FIXIDX,
     ALPHA_SBRK_FIXIDX,
-    ALPHA_WCHAR_FIXIDX,
     AVOID_BOOL_DEFINE_FIXIDX,
     AVOID_BOOL_TYPE_FIXIDX,
     AVOID_WCHAR_T_TYPE_FIXIDX,
@@ -8767,11 +8729,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_SbrkTests,   apzAlpha_SbrkPatch, 0 },
 
-  {  zAlpha_WcharName,    zAlpha_WcharList,
-     apzAlpha_WcharMachs,
-     ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY,
-     aAlpha_WcharTests,   apzAlpha_WcharPatch, 0 },
-
   {  zAvoid_Bool_DefineName,    zAvoid_Bool_DefineList,
      apzAvoid_Bool_DefineMachs,
      AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 910b3889270..4f70a9f3a64 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -794,27 +794,6 @@ fix = {
 
 
 /*
- *  Change external names of wcstok/wcsftime via asm instead of macros on
- *  Tru64 UNIX V4.0.
- */
-fix = {
-    hackname = alpha_wchar;
-    files    = wchar.h;
-
-    mach     = "alpha*-dec-osf4*";
-    select   = "#define wcstok wcstok_r";
-    sed      = "s@#define wcstok wcstok_r@"
-                "extern wchar_t *wcstok __((wchar_t *, const wchar_t *, "
-                          "wchar_t **)) __asm__(\"wcstok_r\");@";
-    sed      = "s@#define wcsftime __wcsftime_isoc@"
-                "extern size_t   wcsftime __((wchar_t *, size_t, const wchar_t *"
-                          ", const struct tm *)) __asm__(\"__wcsftime_isoc\");@";
-    test_text = "#define wcstok wcstok_r\n"
-		"#define wcsftime __wcsftime_isoc";
-};
-
-
-/*
  *  For C++, avoid any typedef or macro definition of bool,
  *  and use the built in type instead.
  *  HP/UX 10.20 also has it in curses_colr/curses.h.
diff --git a/fixincludes/tests/base/wchar.h b/fixincludes/tests/base/wchar.h
deleted file mode 100644
index 5c0b9dfe86a..00000000000
--- a/fixincludes/tests/base/wchar.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*  DO NOT EDIT THIS FILE.
-
-    It has been auto-edited by fixincludes from:
-
-	"fixinc/tests/inc/wchar.h"
-
-    This had to be done to correct non-standard usages in the
-    original, manufacturer supplied header file.  */
-
-
-
-#if defined( ALPHA_WCHAR_CHECK )
-extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__("wcstok_r");
-extern size_t   wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__("__wcsftime_isoc");
-#endif  /* ALPHA_WCHAR_CHECK */