fixinc: 3.3 vs. mainline

[Bruce Korb <bkorb at pacbell dot net>]

Attached are the differences.  I see a few includes moved
around and two fixes reordered, plus the fix applied today
(an include being moved).  I cannot see it causing problems
with GCC 3.3, so I would as soon keep them in sync.  At least,
until the obsolescence patch is applied.  :-)

http://gcc.gnu.org/ml/gcc-patches/2002-12/msg00469.html
http://gcc.gnu.org/ml/gcc-patches/2002-12/msg00566/fixinc.diff.gz
Or, some variation thereof.
--- /home/gnu/gcc.33/gcc/fixinc/fixincl.c	Tue Dec  4 15:29:42 2001
+++ ./fixincl.c	Mon Dec 16 09:34:14 2002
@@ -28,7 +28,6 @@
 #define  BAD_ADDR ((void*)-1)
 #endif
 
-#include <signal.h>
 #if ! defined( SIGCHLD ) && defined( SIGCLD )
 #  define SIGCHLD SIGCLD
 #endif
--- /home/gnu/gcc.33/gcc/fixinc/fixincl.x	Thu Oct 24 16:22:47 2002
+++ ./fixincl.x	Mon Dec 16 13:22:08 2002
@@ -1868,6 +1868,43 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux11_Abs fix
+ */
+tSCC zHpux11_AbsName[] =
+     "hpux11_abs";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_AbsList[] =
+  "|stdlib.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_AbsMachs[] = {
+        "ia64-hp-hpux11*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_AbsSelect0[] =
+       "ifndef _MATH_INCLUDED";
+
+#define    HPUX11_ABS_TEST_CT  1
+static tTestDesc aHpux11_AbsTests[] = {
+  { TT_EGREP,    zHpux11_AbsSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Abs
+ */
+static const char* apzHpux11_AbsPatch[] = {
+    "format",
+    "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux11_Fabsf fix
  */
 tSCC zHpux11_FabsfName[] =
@@ -1912,43 +1949,6 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Abs fix
- */
-tSCC zHpux11_AbsName[] =
-     "hpux11_abs";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_AbsList[] =
-  "|stdlib.h|";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux11_AbsMachs[] = {
-        "ia64-hp-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_AbsSelect0[] =
-       "ifndef _MATH_INCLUDED";
-
-#define    HPUX11_ABS_TEST_CT  1
-static tTestDesc aHpux11_AbsTests[] = {
-  { TT_EGREP,    zHpux11_AbsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Abs
- */
-static const char* apzHpux11_AbsPatch[] = {
-    "format",
-    "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Hpux11_Size_T fix
  */
 tSCC zHpux11_Size_TName[] =
@@ -2527,6 +2527,43 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Libc1_G_Va_List fix
+ */
+tSCC zLibc1_G_Va_ListName[] =
+     "libc1_G_va_list";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zLibc1_G_Va_ListList[] =
+  "|_G_config.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzLibc1_G_Va_ListMachs[] = {
+        "*-*-linux*libc1",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zLibc1_G_Va_ListSelect0[] =
+       "typedef void \\* _G_va_list;";
+
+#define    LIBC1_G_VA_LIST_TEST_CT  1
+static tTestDesc aLibc1_G_Va_ListTests[] = {
+  { TT_EGREP,    zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Libc1_G_Va_List
+ */
+static const char* apzLibc1_G_Va_ListPatch[] = {
+    "format",
+    "typedef __builtin_va_list _G_va_list;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Libc1_Ifdefd_Memx fix
  */
 tSCC zLibc1_Ifdefd_MemxName[] =
@@ -2575,43 +2612,6 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Libc1_G_Va_List fix
- */
-tSCC zLibc1_G_Va_ListName[] =
-     "libc1_G_va_list";
-
-/*
- *  File name selection pattern
- */
-tSCC zLibc1_G_Va_ListList[] =
-  "|_G_config.h|";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzLibc1_G_Va_ListMachs[] = {
-        "*-*-linux*libc1",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zLibc1_G_Va_ListSelect0[] =
-       "typedef void \\* _G_va_list;";
-
-#define    LIBC1_G_VA_LIST_TEST_CT  1
-static tTestDesc aLibc1_G_Va_ListTests[] = {
-  { TT_EGREP,    zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Libc1_G_Va_List
- */
-static const char* apzLibc1_G_Va_ListPatch[] = {
-    "format",
-    "typedef __builtin_va_list _G_va_list;",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Limits_Ifndefs fix
  */
 tSCC zLimits_IfndefsName[] =
@@ -5835,8 +5835,8 @@
     HP_SYSFILE_FIXIDX,
     HPUX10_CPP_POW_INLINE_FIXIDX,
     HPUX11_CPP_POW_INLINE_FIXIDX,
-    HPUX11_FABSF_FIXIDX,
     HPUX11_ABS_FIXIDX,
+    HPUX11_FABSF_FIXIDX,
     HPUX11_SIZE_T_FIXIDX,
     HPUX11_UINT32_C_FIXIDX,
     HPUX11_VSNPRINTF_FIXIDX,
@@ -5853,8 +5853,8 @@
     ISC_FMOD_FIXIDX,
     ISC_OMITS_WITH_STDC_FIXIDX,
     KANDR_CONCAT_FIXIDX,
-    LIBC1_IFDEFD_MEMX_FIXIDX,
     LIBC1_G_VA_LIST_FIXIDX,
+    LIBC1_IFDEFD_MEMX_FIXIDX,
     LIMITS_IFNDEFS_FIXIDX,
     LYNX_VOID_INT_FIXIDX,
     LYNXOS_FCNTL_PROTO_FIXIDX,
@@ -6166,16 +6166,16 @@
      HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_Cpp_Pow_InlineTests,   apzHpux11_Cpp_Pow_InlinePatch, 0 },
 
-  {  zHpux11_FabsfName,    zHpux11_FabsfList,
-     apzHpux11_FabsfMachs,
-     HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_FabsfTests,   apzHpux11_FabsfPatch, 0 },
-
   {  zHpux11_AbsName,    zHpux11_AbsList,
      apzHpux11_AbsMachs,
      HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_AbsTests,   apzHpux11_AbsPatch, 0 },
 
+  {  zHpux11_FabsfName,    zHpux11_FabsfList,
+     apzHpux11_FabsfMachs,
+     HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_FabsfTests,   apzHpux11_FabsfPatch, 0 },
+
   {  zHpux11_Size_TName,    zHpux11_Size_TList,
      apzHpux11_Size_TMachs,
      HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -6256,16 +6256,16 @@
      KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aKandr_ConcatTests,   apzKandr_ConcatPatch, 0 },
 
-  {  zLibc1_Ifdefd_MemxName,    zLibc1_Ifdefd_MemxList,
-     apzLibc1_Ifdefd_MemxMachs,
-     LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aLibc1_Ifdefd_MemxTests,   apzLibc1_Ifdefd_MemxPatch, 0 },
-
   {  zLibc1_G_Va_ListName,    zLibc1_G_Va_ListList,
      apzLibc1_G_Va_ListMachs,
      LIBC1_G_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aLibc1_G_Va_ListTests,   apzLibc1_G_Va_ListPatch, 0 },
 
+  {  zLibc1_Ifdefd_MemxName,    zLibc1_Ifdefd_MemxList,
+     apzLibc1_Ifdefd_MemxMachs,
+     LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aLibc1_Ifdefd_MemxTests,   apzLibc1_Ifdefd_MemxPatch, 0 },
+
   {  zLimits_IfndefsName,    zLimits_IfndefsList,
      apzLimits_IfndefsMachs,
      LIMITS_IFNDEFS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
--- /home/gnu/gcc.33/gcc/fixinc/fixlib.h	Fri May 25 18:31:46 2001
+++ ./fixlib.h	Mon Dec 16 09:34:26 2002
@@ -25,10 +25,11 @@
 #ifndef GCC_FIXLIB_H
 #define GCC_FIXLIB_H
 
-#include "auto-host.h"
-#include "ansidecl.h"
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
+#include <signal.h>
 
 #include "gnu-regex.h"
 #include "machname.h"
--- /home/gnu/gcc.33/gcc/fixinc/procopen.c	Tue Apr  3 17:46:26 2001
+++ ./procopen.c	Mon Dec 16 10:54:11 2002
@@ -45,12 +45,9 @@
  * choice whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  */
-#include "auto-host.h"
-#include "ansidecl.h"
-#include "system.h"
 
-#include "server.h"
 #include "fixlib.h"
+#include "server.h"
 
 STATIC const char* def_args[] =
 { (char *) NULL, (char *) NULL };
--- /home/gnu/gcc.33/gcc/fixinc/server.c	Tue Apr  3 17:46:26 2001
+++ ./server.c	Mon Dec 16 10:54:11 2002
@@ -45,18 +45,10 @@
  * choice whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  */
-#include "auto-host.h"
-
-#include "ansidecl.h"
-#include "system.h"
-#include <signal.h>
 
+#include "fixlib.h"
 #include "server.h"
 
-#if !defined(volatile) && !defined(HAVE_VOLATILE)
-# define volatile
-#endif
-
 STATIC volatile enum t_bool read_pipe_timeout;
 STATIC pid_t server_master_pid = NOPROCESS;
 
--- /home/gnu/gcc.33/gcc/fixinc/server.h	Fri May 25 18:31:46 2001
+++ ./server.h	Mon Dec 16 10:54:11 2002
@@ -49,13 +49,6 @@
 #ifndef GCC_SERVER_H
 #define GCC_SERVER_H
 
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "fixlib.h"
-
 /*
  *  Dual pipe opening of a child process
  */