Keep HP-UX 11 from stomping on C++ math namespace

From-SVN: r33957

gcc/ChangeLog

@@ -4,6 +4,8 @@
 	* fixinc/fixincl.c: improve the debug displays, ignore SIGPIPE
 	* fixinc/server.c: likewise
 	* fixinc/fixfixes.c( char_macro_def_fix ): fix regex
+	* fixinc/inclhack.def( hpux11_fabsf ): Keep HP-UX 11 from stomping
+	on C++ math namespace
 
 2000-05-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 

gcc/fixinc/fixincl.x

@@ -5,7 +5,7 @@
  * files which are fixed to work correctly with ANSI C and placed in a
  * directory that GNU C will search.
  *
- * This file contains 119 fixup descriptions.
+ * This file contains 120 fixup descriptions.
  *
  * See README-fixinc for more information.
  *
@@ -1590,9 +1590,54 @@ const char* apzHp_SysfilePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux11_Fabsf fix
+ */
+#define HPUX11_FABSF_FIXIDX              36
+tSCC zHpux11_FabsfName[] =
+     "hpux11_fabsf";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_FabsfList[] =
+  "|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux11_FabsfMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_FabsfSelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux11_FabsfBypass0[] =
+       "__cplusplus";
+
+#define    HPUX11_FABSF_TEST_CT  2
+tTestDesc aHpux11_FabsfTests[] = {
+  { TT_NEGREP,   zHpux11_FabsfBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHpux11_FabsfSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Fabsf
+ */
+const char* apzHpux11_FabsfPatch[] = {
+    "format",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux8_Bogus_Inlines fix
  */
-#define HPUX8_BOGUS_INLINES_FIXIDX       36
+#define HPUX8_BOGUS_INLINES_FIXIDX       37
 tSCC zHpux8_Bogus_InlinesName[] =
      "hpux8_bogus_inlines";
 
@@ -1630,7 +1675,7 @@ const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
  *
  *  Description of Hpux11_Uint32_C fix
  */
-#define HPUX11_UINT32_C_FIXIDX           37
+#define HPUX11_UINT32_C_FIXIDX           38
 tSCC zHpux11_Uint32_CName[] =
      "hpux11_uint32_c";
 
@@ -1666,7 +1711,7 @@ const char* apzHpux11_Uint32_CPatch[] = {
  *
  *  Description of Isc_Omits_With_Stdc fix
  */
-#define ISC_OMITS_WITH_STDC_FIXIDX       38
+#define ISC_OMITS_WITH_STDC_FIXIDX       39
 tSCC zIsc_Omits_With_StdcName[] =
      "isc_omits_with_stdc";
 
@@ -1702,7 +1747,7 @@ const char* apzIsc_Omits_With_StdcPatch[] = {
  *
  *  Description of Io_Quotes_Def fix
  */
-#define IO_QUOTES_DEF_FIXIDX             39
+#define IO_QUOTES_DEF_FIXIDX             40
 tSCC zIo_Quotes_DefName[] =
      "io_quotes_def";
 
@@ -1737,7 +1782,7 @@ const char* apzIo_Quotes_DefPatch[] = {
  *
  *  Description of Io_Quotes_Use fix
  */
-#define IO_QUOTES_USE_FIXIDX             40
+#define IO_QUOTES_USE_FIXIDX             41
 tSCC zIo_Quotes_UseName[] =
      "io_quotes_use";
 
@@ -1772,7 +1817,7 @@ const char* apzIo_Quotes_UsePatch[] = {
  *
  *  Description of Hpux_Maxint fix
  */
-#define HPUX_MAXINT_FIXIDX               41
+#define HPUX_MAXINT_FIXIDX               42
 tSCC zHpux_MaxintName[] =
      "hpux_maxint";
 
@@ -1810,7 +1855,7 @@ const char* apzHpux_MaxintPatch[] = { "sed",
  *
  *  Description of Hpux_Systime fix
  */
-#define HPUX_SYSTIME_FIXIDX              42
+#define HPUX_SYSTIME_FIXIDX              43
 tSCC zHpux_SystimeName[] =
      "hpux_systime";
 
@@ -1845,7 +1890,7 @@ const char* apzHpux_SystimePatch[] = { "sed",
  *
  *  Description of Ip_Missing_Semi fix
  */
-#define IP_MISSING_SEMI_FIXIDX           43
+#define IP_MISSING_SEMI_FIXIDX           44
 tSCC zIp_Missing_SemiName[] =
      "ip_missing_semi";
 
@@ -1880,7 +1925,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed",
  *
  *  Description of Irix_Asm_Apostrophe fix
  */
-#define IRIX_ASM_APOSTROPHE_FIXIDX       44
+#define IRIX_ASM_APOSTROPHE_FIXIDX       45
 tSCC zIrix_Asm_ApostropheName[] =
      "irix_asm_apostrophe";
 
@@ -1917,7 +1962,7 @@ const char* apzIrix_Asm_ApostrophePatch[] = {
  *
  *  Description of Irix_Multiline_Cmnt fix
  */
-#define IRIX_MULTILINE_CMNT_FIXIDX       45
+#define IRIX_MULTILINE_CMNT_FIXIDX       46
 tSCC zIrix_Multiline_CmntName[] =
      "irix_multiline_cmnt";
 
@@ -1945,7 +1990,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed",
  *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  46
+#define ISC_FMOD_FIXIDX                  47
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -1981,7 +2026,7 @@ const char* apzIsc_FmodPatch[] = {
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              47
+#define KANDR_CONCAT_FIXIDX              48
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2017,7 +2062,7 @@ const char* apzKandr_ConcatPatch[] = {
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            48
+#define LIMITS_IFNDEFS_FIXIDX            49
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2056,7 +2101,7 @@ const char* apzLimits_IfndefsPatch[] = {
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             49
+#define LYNX_VOID_INT_FIXIDX             50
 tSCC zLynx_Void_IntName[] =
      "lynx_void_int";
 
@@ -2092,7 +2137,7 @@ const char* apzLynx_Void_IntPatch[] = {
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        50
+#define LYNXOS_FCNTL_PROTO_FIXIDX        51
 tSCC zLynxos_Fcntl_ProtoName[] =
      "lynxos_fcntl_proto";
 
@@ -2129,7 +2174,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = {
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        51
+#define M88K_BAD_HYPOT_OPT_FIXIDX        52
 tSCC zM88k_Bad_Hypot_OptName[] =
      "m88k_bad_hypot_opt";
 
@@ -2178,7 +2223,7 @@ static __inline__ double fake_hypot (x, y)\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             52
+#define M88K_BAD_S_IF_FIXIDX             53
 tSCC zM88k_Bad_S_IfName[] =
      "m88k_bad_s_if";
 
@@ -2217,7 +2262,7 @@ const char* apzM88k_Bad_S_IfPatch[] = {
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           53
+#define M88K_MULTI_INCL_FIXIDX           54
 tSCC zM88k_Multi_InclName[] =
      "m88k_multi_incl";
 
@@ -2259,7 +2304,7 @@ const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    54
+#define MACHINE_ANSI_H_VA_LIST_FIXIDX    55
 tSCC zMachine_Ansi_H_Va_ListName[] =
      "machine_ansi_h_va_list";
 
@@ -2301,7 +2346,7 @@ const char* apzMachine_Ansi_H_Va_ListPatch[] = { "sed",
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              55
+#define MACHINE_NAME_FIXIDX              56
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2334,7 +2379,7 @@ const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            56
+#define MATH_EXCEPTION_FIXIDX            57
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2382,7 +2427,7 @@ const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 57
+#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 58
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2429,7 +2474,7 @@ const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
  *
  *  Description of Math_Huge_Val_Ifndef fix
  */
-#define MATH_HUGE_VAL_IFNDEF_FIXIDX      58
+#define MATH_HUGE_VAL_IFNDEF_FIXIDX      59
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -2467,7 +2512,7 @@ const char* apzMath_Huge_Val_IfndefPatch[] = { "sed",
  *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           59
+#define NESTED_MOTOROLA_FIXIDX           60
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -2497,7 +2542,7 @@ const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         60
+#define NESTED_SYS_LIMITS_FIXIDX         61
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -2533,7 +2578,7 @@ const char* apzNested_Sys_LimitsPatch[] = { "sed",
  *
  *  Description of Nested_Auth_Des fix
  */
-#define NESTED_AUTH_DES_FIXIDX           61
+#define NESTED_AUTH_DES_FIXIDX           62
 tSCC zNested_Auth_DesName[] =
      "nested_auth_des";
 
@@ -2569,7 +2614,7 @@ const char* apzNested_Auth_DesPatch[] = {
  *
  *  Description of Nested_Ultrix fix
  */
-#define NESTED_ULTRIX_FIXIDX             62
+#define NESTED_ULTRIX_FIXIDX             63
 tSCC zNested_UltrixName[] =
      "nested_ultrix";
 
@@ -2596,7 +2641,7 @@ const char* apzNested_UltrixPatch[] = { "sed",
  *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         63
+#define NEWS_OS_RECURSION_FIXIDX         64
 tSCC zNews_Os_RecursionName[] =
      "news_os_recursion";
 
@@ -2634,7 +2679,7 @@ const char* apzNews_Os_RecursionPatch[] = { "sed",
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          64
+#define NEXT_MATH_PREFIX_FIXIDX          65
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -2673,7 +2718,7 @@ const char* apzNext_Math_PrefixPatch[] = { "sed",
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             65
+#define NEXT_TEMPLATE_FIXIDX             66
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -2709,7 +2754,7 @@ const char* apzNext_TemplatePatch[] = { "sed",
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             66
+#define NEXT_VOLITILE_FIXIDX             67
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -2745,7 +2790,7 @@ const char* apzNext_VolitilePatch[] = { "sed",
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           67
+#define NEXT_WAIT_UNION_FIXIDX           68
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -2780,7 +2825,7 @@ const char* apzNext_Wait_UnionPatch[] = { "sed",
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            68
+#define NODEENT_SYNTAX_FIXIDX            69
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -2807,7 +2852,7 @@ const char* apzNodeent_SyntaxPatch[] = { "sed",
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           69
+#define OSF_NAMESPACE_A_FIXIDX           70
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -2853,7 +2898,7 @@ const char* apzOsf_Namespace_APatch[] = { "sed",
  *
  *  Description of Osf_Namespace_B fix
  */
-#define OSF_NAMESPACE_B_FIXIDX           70
+#define OSF_NAMESPACE_B_FIXIDX           71
 tSCC zOsf_Namespace_BName[] =
      "osf_namespace_b";
 
@@ -2900,7 +2945,7 @@ typedef __regmatch_t\tregmatch_t;\n",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         71
+#define PTHREAD_PAGE_SIZE_FIXIDX         72
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -2935,7 +2980,7 @@ const char* apzPthread_Page_SizePatch[] = { "sed",
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             72
+#define READ_RET_TYPE_FIXIDX             73
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -2971,7 +3016,7 @@ const char* apzRead_Ret_TypePatch[] = { "sed",
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             73
+#define RS6000_DOUBLE_FIXIDX             74
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3009,7 +3054,7 @@ const char* apzRs6000_DoublePatch[] = { "sed",
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             74
+#define RS6000_FCHMOD_FIXIDX             75
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3044,7 +3089,7 @@ const char* apzRs6000_FchmodPatch[] = { "sed",
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              75
+#define RS6000_PARAM_FIXIDX              76
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3079,7 +3124,7 @@ const char* apzRs6000_ParamPatch[] = { "sed",
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           76
+#define SCO_STATIC_FUNC_FIXIDX           77
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3123,7 +3168,7 @@ extern \"C\" {\\\n\
  *
  *  Description of Sco_Strict_Ansi fix
  */
-#define SCO_STRICT_ANSI_FIXIDX           77
+#define SCO_STRICT_ANSI_FIXIDX           78
 tSCC zSco_Strict_AnsiName[] =
      "sco_strict_ansi";
 
@@ -3159,7 +3204,7 @@ const char* apzSco_Strict_AnsiPatch[] = { "sed",
  *
  *  Description of Sco_Utime fix
  */
-#define SCO_UTIME_FIXIDX                 78
+#define SCO_UTIME_FIXIDX                 79
 tSCC zSco_UtimeName[] =
      "sco_utime";
 
@@ -3196,7 +3241,7 @@ const char* apzSco_UtimePatch[] = { "sed",
  *
  *  Description of Sony_Include fix
  */
-#define SONY_INCLUDE_FIXIDX              79
+#define SONY_INCLUDE_FIXIDX              80
 tSCC zSony_IncludeName[] =
      "sony_include";
 
@@ -3231,7 +3276,7 @@ const char* apzSony_IncludePatch[] = { "sed",
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                80
+#define STATSSWTCH_FIXIDX                81
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3266,7 +3311,7 @@ const char* apzStatsswtchPatch[] = { "sed",
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            81
+#define STDIO_STDARG_H_FIXIDX            82
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3303,7 +3348,7 @@ const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             82
+#define STDIO_VA_LIST_FIXIDX             83
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3348,7 +3393,7 @@ s@_Va_LIST@_VA_LIST@",
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               83
+#define STRUCT_FILE_FIXIDX               84
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3385,7 +3430,7 @@ const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           84
+#define STRUCT_SOCKADDR_FIXIDX           85
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -3429,7 +3474,7 @@ const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            85
+#define SUN_AUTH_PROTO_FIXIDX            86
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -3469,7 +3514,7 @@ const char* apzSun_Auth_ProtoPatch[] = { "sed",
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           86
+#define SUN_BOGUS_IFDEF_FIXIDX           87
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -3504,7 +3549,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { "sed",
  *
  *  Description of Sun_Bogus_Ifdef_Sun4c fix
  */
-#define SUN_BOGUS_IFDEF_SUN4C_FIXIDX     87
+#define SUN_BOGUS_IFDEF_SUN4C_FIXIDX     88
 tSCC zSun_Bogus_Ifdef_Sun4cName[] =
      "sun_bogus_ifdef_sun4c";
 
@@ -3539,7 +3584,7 @@ const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              88
+#define SUN_CATMACRO_FIXIDX              89
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -3579,7 +3624,7 @@ const char* apzSun_CatmacroPatch[] = { "sed",
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                89
+#define SUN_MALLOC_FIXIDX                90
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -3609,7 +3654,7 @@ const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           90
+#define SUN_RUSERS_SEMI_FIXIDX           91
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -3644,7 +3689,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                91
+#define SUN_SIGNAL_FIXIDX                92
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -3684,7 +3729,7 @@ void\t(*signal(...))(...);\\\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        92
+#define SUNOS_MATHERR_DECL_FIXIDX        93
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -3721,7 +3766,7 @@ struct exception;\n",
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              93
+#define SUNOS_STRLEN_FIXIDX              94
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -3756,7 +3801,7 @@ const char* apzSunos_StrlenPatch[] = { "sed",
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               94
+#define SVR4_GETCWD_FIXIDX               95
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -3791,7 +3836,7 @@ const char* apzSvr4_GetcwdPatch[] = { "sed",
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               95
+#define SVR4_PROFIL_FIXIDX               96
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -3818,7 +3863,7 @@ const char* apzSvr4_ProfilPatch[] = { "sed",
  *
  *  Description of Systypes fix
  */
-#define SYSTYPES_FIXIDX                  96
+#define SYSTYPES_FIXIDX                  97
 tSCC zSystypesName[] =
      "systypes";
 
@@ -3877,7 +3922,7 @@ typedef __SIZE_TYPE__ size_t;\\\n\
  *
  *  Description of Systypes_Stdlib_Size_T fix
  */
-#define SYSTYPES_STDLIB_SIZE_T_FIXIDX    97
+#define SYSTYPES_STDLIB_SIZE_T_FIXIDX    98
 tSCC zSystypes_Stdlib_Size_TName[] =
      "systypes_stdlib_size_t";
 
@@ -3923,7 +3968,7 @@ const char* apzSystypes_Stdlib_Size_TPatch[] = { "sed",
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             98
+#define SYSV68_STRING_FIXIDX             99
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -3960,7 +4005,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       99
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       100
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -3993,7 +4038,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
  *
  *  Description of Sysz_Stdtypes_For_Sun fix
  */
-#define SYSZ_STDTYPES_FOR_SUN_FIXIDX     100
+#define SYSZ_STDTYPES_FOR_SUN_FIXIDX     101
 tSCC zSysz_Stdtypes_For_SunName[] =
      "sysz_stdtypes_for_sun";
 
@@ -4034,7 +4079,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           101
+#define TINFO_CPLUSPLUS_FIXIDX           102
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4069,7 +4114,7 @@ const char* apzTinfo_CplusplusPatch[] = { "sed",
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         102
+#define ULTRIX_ATOF_PARAM_FIXIDX         103
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4104,7 +4149,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { "sed",
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              103
+#define ULTRIX_CONST_FIXIDX              104
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4139,7 +4184,7 @@ const char* apzUltrix_ConstPatch[] = { "sed",
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       104
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       105
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4175,7 +4220,7 @@ struct utsname;\n",
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              105
+#define ULTRIX_IFDEF_FIXIDX              106
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4210,7 +4255,7 @@ const char* apzUltrix_IfdefPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             106
+#define ULTRIX_STATIC_FIXIDX             107
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4247,7 +4292,7 @@ const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             107
+#define UNDEFINE_NULL_FIXIDX             108
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -4293,7 +4338,7 @@ const char* apzUndefine_NullPatch[] = {
  *
  *  Description of Unixware7_Byteorder_Fix fix
  */
-#define UNIXWARE7_BYTEORDER_FIX_FIXIDX   108
+#define UNIXWARE7_BYTEORDER_FIX_FIXIDX   109
 tSCC zUnixware7_Byteorder_FixName[] =
      "unixware7_byteorder_fix";
 
@@ -4336,7 +4381,7 @@ const char* apzUnixware7_Byteorder_FixPatch[] = { "sed",
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             109
+#define VA_I960_MACRO_FIXIDX             110
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -4374,7 +4419,7 @@ const char* apzVa_I960_MacroPatch[] = { "sed",
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 110
+#define VOID_NULL_FIXIDX                 111
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -4409,7 +4454,7 @@ const char* apzVoid_NullPatch[] = { "sed",
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       111
+#define VXWORKS_GCC_PROBLEM_FIXIDX       112
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -4459,7 +4504,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     112
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     113
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -4494,7 +4539,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     113
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     114
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -4543,7 +4588,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              114
+#define VXWORKS_TIME_FIXIDX              115
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -4594,7 +4639,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\\\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 115
+#define X11_CLASS_FIXIDX                 116
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -4634,7 +4679,7 @@ const char* apzX11_ClassPatch[] = { "sed",
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           116
+#define X11_CLASS_USAGE_FIXIDX           117
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -4669,7 +4714,7 @@ const char* apzX11_Class_UsagePatch[] = { "sed",
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   117
+#define X11_NEW_FIXIDX                   118
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -4710,7 +4755,7 @@ const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               118
+#define X11_SPRINTF_FIXIDX               119
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -4748,9 +4793,9 @@ extern char *\tsprintf();\\\n\
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          109
+#define REGEX_COUNT          111
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            119
+#define FIX_COUNT            120
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
@@ -4933,6 +4978,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HP_SYSFILE_TEST_CT, FD_MACH_ONLY,
      aHp_SysfileTests,   apzHp_SysfilePatch },
 
+  {  zHpux11_FabsfName,    zHpux11_FabsfList,
+     apzHpux11_FabsfMachs,
+     HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_FabsfTests,   apzHpux11_FabsfPatch },
+
   {  zHpux8_Bogus_InlinesName,    zHpux8_Bogus_InlinesList,
      apzHpux8_Bogus_InlinesMachs,
      HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY,

gcc/fixinc/inclhack.def

@@ -931,6 +931,26 @@ fix = {
 
 
 /*
+ *  Keep HP-UX 11 from stomping on C++ math namespace
+ *  with defines for fabsf.
+ */
+fix = {
+    hackname  = hpux11_fabsf;
+    files     = math.h;
+    select    = "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*";
+    bypass    = "__cplusplus";
+
+    c_fix     = format;
+    c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
+
+    test_text =
+    "#ifdef _PA_RISC\n"
+    "#  define fabsf(x) ((float)fabs((double)(float)(x)))\n"
+    "#endif";
+};
+
+
+/*
  *  get rid of bogus inline definitions in HP-UX 8.0
  */
 fix = {