From 6822468a694e59639c0f97975a2f48951501fd37 Mon Sep 17 00:00:00 2001 From: Laurynas Biveinis Date: Wed, 7 Mar 2001 19:05:25 +0000 Subject: Makefile.in: Remove RANLIB definition. * 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. * Makefile.in: Set RANLIB to @RANLIB@. Remove RANLIB_TEST. * fixinc/inclhack.def (djgpp_wchar_h): New test. * fixinc/fixincl.x: Regenerated. From-SVN: r40299 --- ChangeLog | 6 ++ Makefile.in | 18 ++-- gcc/ChangeLog | 10 ++ gcc/Makefile.in | 12 +-- gcc/fixinc/fixincl.x | 245 +++++++++++++++++++++++++++++------------------- gcc/fixinc/inclhack.def | 14 +++ 6 files changed, 190 insertions(+), 115 deletions(-) diff --git a/ChangeLog b/ChangeLog index b704c1b..9eb7019 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-03-06 Laurynas Biveinis + + * 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 Alexandre Oliva diff --git a/Makefile.in b/Makefile.in index f6f1ebc..5b34c2d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -102,8 +102,6 @@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates CXXFLAGS_FOR_TARGET = $(CXXFLAGS) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -RANLIB = ranlib - DLLTOOL = dlltool WINDRES = windres @@ -288,7 +286,11 @@ RANLIB_FOR_TARGET = ` \ echo $$r/binutils/ranlib ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ - echo $(RANLIB); \ + 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; \ @@ -399,7 +401,7 @@ EXTRA_HOST_FLAGS = \ 'DLLTOOL=$(DLLTOOL)' \ 'LD=$(LD)' \ 'NM=$(NM)' \ - 'RANLIB=$(RANLIB)' \ + "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \ 'WINDRES=$(WINDRES)' FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) @@ -432,7 +434,7 @@ EXTRA_TARGET_FLAGS = \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \ - 'RANLIB=$$(RANLIB_FOR_TARGET)' \ + "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \ 'WINDRES=$$(WINDRES_FOR_TARGET)' TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -453,7 +455,7 @@ EXTRA_GCC_FLAGS = \ 'HOST_PREFIX=$(HOST_PREFIX)' \ 'HOST_PREFIX_1=$(HOST_PREFIX_1)' \ 'NM=$(NM)' \ - 'RANLIB=$(RANLIB)' \ + "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \ @@ -965,7 +967,7 @@ $(DO_X): if (cd ./$$i; \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ + "`echo 'RANLIB=$${RANLIB}' | sed -e s/.*=$$/XFOO=/`" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ $${target}); \ then true; else exit 1; fi; \ @@ -984,7 +986,7 @@ $(DO_X): if (cd $(TARGET_SUBDIR)/$$i; \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ + "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ $${target}); \ then true; else exit 1; fi; \ diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4e55b27..df78a57 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2001-03-07 Laurynas Biveinis + + * Makefile.in: Set RANLIB to @RANLIB@. + Remove RANLIB_TEST. + +2001-03-07 Laurynas Biveinis + + * fixinc/inclhack.def (djgpp_wchar_h): New test. + * fixinc/fixincl.x: Regenerated. + 2001-03-07 Richard Henderson * config/alpha/alpha.md (call_osf_1_noreturn): New pattern. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index be2e4ad..53780db 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -112,6 +112,7 @@ FLEXFLAGS = AR = ar AR_FLAGS = rc DLLTOOL = dlltool +RANLIB = @RANLIB@ SHELL = /bin/sh # on sysV, define this as cp. INSTALL = @INSTALL@ @@ -140,13 +141,6 @@ OUTPUT_OPTION = @OUTPUT_OPTION@ ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ -# How to invoke ranlib. -RANLIB = ranlib -# Test to use to see whether ranlib exists on the system. -RANLIB_TEST = \ - [ -f $(RANLIB) ] \ - || [ -f /usr/bin/ranlib -o -f /bin/ranlib ] - # Substitution type for target's getgroups 2nd arg. TARGET_GETGROUPS_T = @TARGET_GETGROUPS_T@ @@ -958,7 +952,7 @@ compilations: $(BACKEND) libbackend.a: $(OBJS) -rm -rf libbackend.a $(AR) $(AR_FLAGS) libbackend.a $(OBJS) - if $(RANLIB_TEST) ; then $(RANLIB) libbackend.a ; else true ; fi + -$(RANLIB) libbackend.a # We call this executable `xgcc' rather than `gcc' # to avoid confusion if the current directory is in the path @@ -1907,7 +1901,7 @@ LIBCPP_DEPS = cpplib.h cpphash.h intl.h system.h libcpp.a: $(LIBCPP_OBJS) -rm -rf libcpp.a $(AR) $(AR_FLAGS) libcpp.a $(LIBCPP_OBJS) - if $(RANLIB_TEST) ; then $(RANLIB) libcpp.a ; else true ; fi + -$(RANLIB) libcpp.a cpp0$(exeext): cppmain.o intl.o libcpp.a $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o cpp0$(exeext) cppmain.o \ diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 2fd2311..832f3ab 100644 --- a/gcc/fixinc/fixincl.x +++ b/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 134 fixup descriptions. + * This file contains 135 fixup descriptions. * * See README for more information. * @@ -1711,9 +1711,53 @@ static const char* apzDec_Intern_AsmPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Djgpp_Wchar_H fix + */ +#define DJGPP_WCHAR_H_FIXIDX 39 +tSCC zDjgpp_Wchar_HName[] = + "djgpp_wchar_h"; + +/* + * File name selection pattern + */ +#define zDjgpp_Wchar_HList (char*)NULL +/* + * Machine/OS name selection pattern + */ +#define apzDjgpp_Wchar_HMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDjgpp_Wchar_HSelect0[] = + "__DJ_wint_t"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDjgpp_Wchar_HBypass0[] = + "sys/djtypes.h"; + +#define DJGPP_WCHAR_H_TEST_CT 2 +static tTestDesc aDjgpp_Wchar_HTests[] = { + { TT_NEGREP, zDjgpp_Wchar_HBypass0, (regex_t*)NULL }, + { TT_EGREP, zDjgpp_Wchar_HSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Djgpp_Wchar_H + */ +static const char* apzDjgpp_Wchar_HPatch[] = { + "format", + "%0\n\ +#include ", + "#include ", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Ecd_Cursor fix */ -#define ECD_CURSOR_FIXIDX 39 +#define ECD_CURSOR_FIXIDX 40 tSCC zEcd_CursorName[] = "ecd_cursor"; @@ -1749,7 +1793,7 @@ static const char* apzEcd_CursorPatch[] = { * * Description of Fix_Header_Breakage fix */ -#define FIX_HEADER_BREAKAGE_FIXIDX 40 +#define FIX_HEADER_BREAKAGE_FIXIDX 41 tSCC zFix_Header_BreakageName[] = "fix_header_breakage"; @@ -1787,7 +1831,7 @@ static const char* apzFix_Header_BreakagePatch[] = { * * Description of Freebsd_Gcc3_Breakage fix */ -#define FREEBSD_GCC3_BREAKAGE_FIXIDX 41 +#define FREEBSD_GCC3_BREAKAGE_FIXIDX 42 tSCC zFreebsd_Gcc3_BreakageName[] = "freebsd_gcc3_breakage"; @@ -1832,7 +1876,7 @@ static const char* apzFreebsd_Gcc3_BreakagePatch[] = { * * Description of Hp_Inline fix */ -#define HP_INLINE_FIXIDX 42 +#define HP_INLINE_FIXIDX 43 tSCC zHp_InlineName[] = "hp_inline"; @@ -1869,7 +1913,7 @@ static const char* apzHp_InlinePatch[] = { * * Description of Hp_Sysfile fix */ -#define HP_SYSFILE_FIXIDX 43 +#define HP_SYSFILE_FIXIDX 44 tSCC zHp_SysfileName[] = "hp_sysfile"; @@ -1906,7 +1950,7 @@ static const char* apzHp_SysfilePatch[] = { * * Description of Hpux11_Fabsf fix */ -#define HPUX11_FABSF_FIXIDX 44 +#define HPUX11_FABSF_FIXIDX 45 tSCC zHpux11_FabsfName[] = "hpux11_fabsf"; @@ -1951,7 +1995,7 @@ static const char* apzHpux11_FabsfPatch[] = { * * Description of Hpux11_Uint32_C fix */ -#define HPUX11_UINT32_C_FIXIDX 45 +#define HPUX11_UINT32_C_FIXIDX 46 tSCC zHpux11_Uint32_CName[] = "hpux11_uint32_c"; @@ -1987,7 +2031,7 @@ static const char* apzHpux11_Uint32_CPatch[] = { * * Description of Hpux8_Bogus_Inlines fix */ -#define HPUX8_BOGUS_INLINES_FIXIDX 46 +#define HPUX8_BOGUS_INLINES_FIXIDX 47 tSCC zHpux8_Bogus_InlinesName[] = "hpux8_bogus_inlines"; @@ -2025,7 +2069,7 @@ static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed", * * Description of Int_Abort_Free_And_Exit fix */ -#define INT_ABORT_FREE_AND_EXIT_FIXIDX 47 +#define INT_ABORT_FREE_AND_EXIT_FIXIDX 48 tSCC zInt_Abort_Free_And_ExitName[] = "int_abort_free_and_exit"; @@ -2061,7 +2105,7 @@ static const char* apzInt_Abort_Free_And_ExitPatch[] = { * * Description of Isc_Omits_With_Stdc fix */ -#define ISC_OMITS_WITH_STDC_FIXIDX 48 +#define ISC_OMITS_WITH_STDC_FIXIDX 49 tSCC zIsc_Omits_With_StdcName[] = "isc_omits_with_stdc"; @@ -2097,7 +2141,7 @@ static const char* apzIsc_Omits_With_StdcPatch[] = { * * Description of Io_Quotes_Def fix */ -#define IO_QUOTES_DEF_FIXIDX 49 +#define IO_QUOTES_DEF_FIXIDX 50 tSCC zIo_Quotes_DefName[] = "io_quotes_def"; @@ -2132,7 +2176,7 @@ static const char* apzIo_Quotes_DefPatch[] = { * * Description of Io_Quotes_Use fix */ -#define IO_QUOTES_USE_FIXIDX 50 +#define IO_QUOTES_USE_FIXIDX 51 tSCC zIo_Quotes_UseName[] = "io_quotes_use"; @@ -2167,7 +2211,7 @@ static const char* apzIo_Quotes_UsePatch[] = { * * Description of Hpux_Maxint fix */ -#define HPUX_MAXINT_FIXIDX 51 +#define HPUX_MAXINT_FIXIDX 52 tSCC zHpux_MaxintName[] = "hpux_maxint"; @@ -2220,7 +2264,7 @@ static const char* apzHpux_MaxintPatch[] = { * * Description of Hpux_Systime fix */ -#define HPUX_SYSTIME_FIXIDX 52 +#define HPUX_SYSTIME_FIXIDX 53 tSCC zHpux_SystimeName[] = "hpux_systime"; @@ -2256,7 +2300,7 @@ static const char* apzHpux_SystimePatch[] = { * * Description of Ip_Missing_Semi fix */ -#define IP_MISSING_SEMI_FIXIDX 53 +#define IP_MISSING_SEMI_FIXIDX 54 tSCC zIp_Missing_SemiName[] = "ip_missing_semi"; @@ -2291,7 +2335,7 @@ static const char* apzIp_Missing_SemiPatch[] = { "sed", * * Description of Irix_Asm_Apostrophe fix */ -#define IRIX_ASM_APOSTROPHE_FIXIDX 54 +#define IRIX_ASM_APOSTROPHE_FIXIDX 55 tSCC zIrix_Asm_ApostropheName[] = "irix_asm_apostrophe"; @@ -2328,7 +2372,7 @@ static const char* apzIrix_Asm_ApostrophePatch[] = { * * Description of Irix_Limits_Const fix */ -#define IRIX_LIMITS_CONST_FIXIDX 55 +#define IRIX_LIMITS_CONST_FIXIDX 56 tSCC zIrix_Limits_ConstName[] = "irix_limits_const"; @@ -2364,7 +2408,7 @@ static const char* apzIrix_Limits_ConstPatch[] = { * * Description of Isc_Fmod fix */ -#define ISC_FMOD_FIXIDX 56 +#define ISC_FMOD_FIXIDX 57 tSCC zIsc_FmodName[] = "isc_fmod"; @@ -2400,7 +2444,7 @@ static const char* apzIsc_FmodPatch[] = { * * Description of Kandr_Concat fix */ -#define KANDR_CONCAT_FIXIDX 57 +#define KANDR_CONCAT_FIXIDX 58 tSCC zKandr_ConcatName[] = "kandr_concat"; @@ -2436,7 +2480,7 @@ static const char* apzKandr_ConcatPatch[] = { * * Description of Libc1_Ifdefd_Memx fix */ -#define LIBC1_IFDEFD_MEMX_FIXIDX 58 +#define LIBC1_IFDEFD_MEMX_FIXIDX 59 tSCC zLibc1_Ifdefd_MemxName[] = "libc1_ifdefd_memx"; @@ -2485,7 +2529,7 @@ extern [a-z_]+ mem.*(\n\ * * Description of Limits_Ifndefs fix */ -#define LIMITS_IFNDEFS_FIXIDX 59 +#define LIMITS_IFNDEFS_FIXIDX 60 tSCC zLimits_IfndefsName[] = "limits_ifndefs"; @@ -2524,7 +2568,7 @@ static const char* apzLimits_IfndefsPatch[] = { * * Description of Lynx_Void_Int fix */ -#define LYNX_VOID_INT_FIXIDX 60 +#define LYNX_VOID_INT_FIXIDX 61 tSCC zLynx_Void_IntName[] = "lynx_void_int"; @@ -2560,7 +2604,7 @@ static const char* apzLynx_Void_IntPatch[] = { * * Description of Lynxos_Fcntl_Proto fix */ -#define LYNXOS_FCNTL_PROTO_FIXIDX 61 +#define LYNXOS_FCNTL_PROTO_FIXIDX 62 tSCC zLynxos_Fcntl_ProtoName[] = "lynxos_fcntl_proto"; @@ -2597,7 +2641,7 @@ static const char* apzLynxos_Fcntl_ProtoPatch[] = { * * Description of M88k_Bad_Hypot_Opt fix */ -#define M88K_BAD_HYPOT_OPT_FIXIDX 62 +#define M88K_BAD_HYPOT_OPT_FIXIDX 63 tSCC zM88k_Bad_Hypot_OptName[] = "m88k_bad_hypot_opt"; @@ -2646,7 +2690,7 @@ static __inline__ double fake_hypot (x, y)\n\ * * Description of M88k_Bad_S_If fix */ -#define M88K_BAD_S_IF_FIXIDX 63 +#define M88K_BAD_S_IF_FIXIDX 64 tSCC zM88k_Bad_S_IfName[] = "m88k_bad_s_if"; @@ -2685,7 +2729,7 @@ static const char* apzM88k_Bad_S_IfPatch[] = { * * Description of M88k_Multi_Incl fix */ -#define M88K_MULTI_INCL_FIXIDX 64 +#define M88K_MULTI_INCL_FIXIDX 65 tSCC zM88k_Multi_InclName[] = "m88k_multi_incl"; @@ -2722,7 +2766,7 @@ static const char* apzM88k_Multi_InclPatch[] = { * * Description of Machine_Ansi_H_Va_List fix */ -#define MACHINE_ANSI_H_VA_LIST_FIXIDX 65 +#define MACHINE_ANSI_H_VA_LIST_FIXIDX 66 tSCC zMachine_Ansi_H_Va_ListName[] = "machine_ansi_h_va_list"; @@ -2765,7 +2809,7 @@ static const char* apzMachine_Ansi_H_Va_ListPatch[] = { * * Description of Machine_Name fix */ -#define MACHINE_NAME_FIXIDX 66 +#define MACHINE_NAME_FIXIDX 67 tSCC zMachine_NameName[] = "machine_name"; @@ -2798,7 +2842,7 @@ static const char* apzMachine_NamePatch[] = { * * Description of Math_Exception fix */ -#define MATH_EXCEPTION_FIXIDX 67 +#define MATH_EXCEPTION_FIXIDX 68 tSCC zMath_ExceptionName[] = "math_exception"; @@ -2846,7 +2890,7 @@ static const char* apzMath_ExceptionPatch[] = { * * Description of Math_Huge_Val_From_Dbl_Max fix */ -#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 68 +#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 69 tSCC zMath_Huge_Val_From_Dbl_MaxName[] = "math_huge_val_from_dbl_max"; @@ -2893,7 +2937,7 @@ static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c", * * Description of Math_Huge_Val_Ifndef fix */ -#define MATH_HUGE_VAL_IFNDEF_FIXIDX 69 +#define MATH_HUGE_VAL_IFNDEF_FIXIDX 70 tSCC zMath_Huge_Val_IfndefName[] = "math_huge_val_ifndef"; @@ -2932,7 +2976,7 @@ static const char* apzMath_Huge_Val_IfndefPatch[] = { * * Description of Nested_Motorola fix */ -#define NESTED_MOTOROLA_FIXIDX 70 +#define NESTED_MOTOROLA_FIXIDX 71 tSCC zNested_MotorolaName[] = "nested_motorola"; @@ -2970,7 +3014,7 @@ static const char* apzNested_MotorolaPatch[] = { "sed", * * Description of Nested_Sys_Limits fix */ -#define NESTED_SYS_LIMITS_FIXIDX 71 +#define NESTED_SYS_LIMITS_FIXIDX 72 tSCC zNested_Sys_LimitsName[] = "nested_sys_limits"; @@ -3006,7 +3050,7 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed", * * Description of Nested_Auth_Des fix */ -#define NESTED_AUTH_DES_FIXIDX 72 +#define NESTED_AUTH_DES_FIXIDX 73 tSCC zNested_Auth_DesName[] = "nested_auth_des"; @@ -3042,7 +3086,7 @@ static const char* apzNested_Auth_DesPatch[] = { * * Description of News_Os_Recursion fix */ -#define NEWS_OS_RECURSION_FIXIDX 73 +#define NEWS_OS_RECURSION_FIXIDX 74 tSCC zNews_Os_RecursionName[] = "news_os_recursion"; @@ -3080,7 +3124,7 @@ static const char* apzNews_Os_RecursionPatch[] = { * * Description of Next_Math_Prefix fix */ -#define NEXT_MATH_PREFIX_FIXIDX 74 +#define NEXT_MATH_PREFIX_FIXIDX 75 tSCC zNext_Math_PrefixName[] = "next_math_prefix"; @@ -3117,7 +3161,7 @@ static const char* apzNext_Math_PrefixPatch[] = { * * Description of Next_Template fix */ -#define NEXT_TEMPLATE_FIXIDX 75 +#define NEXT_TEMPLATE_FIXIDX 76 tSCC zNext_TemplateName[] = "next_template"; @@ -3154,7 +3198,7 @@ static const char* apzNext_TemplatePatch[] = { * * Description of Next_Volitile fix */ -#define NEXT_VOLITILE_FIXIDX 76 +#define NEXT_VOLITILE_FIXIDX 77 tSCC zNext_VolitileName[] = "next_volitile"; @@ -3191,7 +3235,7 @@ static const char* apzNext_VolitilePatch[] = { * * Description of Next_Wait_Union fix */ -#define NEXT_WAIT_UNION_FIXIDX 77 +#define NEXT_WAIT_UNION_FIXIDX 78 tSCC zNext_Wait_UnionName[] = "next_wait_union"; @@ -3227,7 +3271,7 @@ static const char* apzNext_Wait_UnionPatch[] = { * * Description of Nodeent_Syntax fix */ -#define NODEENT_SYNTAX_FIXIDX 78 +#define NODEENT_SYNTAX_FIXIDX 79 tSCC zNodeent_SyntaxName[] = "nodeent_syntax"; @@ -3263,7 +3307,7 @@ static const char* apzNodeent_SyntaxPatch[] = { * * Description of Osf_Namespace_A fix */ -#define OSF_NAMESPACE_A_FIXIDX 79 +#define OSF_NAMESPACE_A_FIXIDX 80 tSCC zOsf_Namespace_AName[] = "osf_namespace_a"; @@ -3309,7 +3353,7 @@ static const char* apzOsf_Namespace_APatch[] = { * * Description of Osf_Namespace_C fix */ -#define OSF_NAMESPACE_C_FIXIDX 80 +#define OSF_NAMESPACE_C_FIXIDX 81 tSCC zOsf_Namespace_CName[] = "osf_namespace_c"; @@ -3364,7 +3408,7 @@ typedef __regmatch_t\tregmatch_t;", * * Description of Pthread_Page_Size fix */ -#define PTHREAD_PAGE_SIZE_FIXIDX 81 +#define PTHREAD_PAGE_SIZE_FIXIDX 82 tSCC zPthread_Page_SizeName[] = "pthread_page_size"; @@ -3400,7 +3444,7 @@ static const char* apzPthread_Page_SizePatch[] = { * * Description of Read_Ret_Type fix */ -#define READ_RET_TYPE_FIXIDX 82 +#define READ_RET_TYPE_FIXIDX 83 tSCC zRead_Ret_TypeName[] = "read_ret_type"; @@ -3438,7 +3482,7 @@ static const char* apzRead_Ret_TypePatch[] = { * * Description of Rs6000_Double fix */ -#define RS6000_DOUBLE_FIXIDX 83 +#define RS6000_DOUBLE_FIXIDX 84 tSCC zRs6000_DoubleName[] = "rs6000_double"; @@ -3477,7 +3521,7 @@ static const char* apzRs6000_DoublePatch[] = { * * Description of Rs6000_Fchmod fix */ -#define RS6000_FCHMOD_FIXIDX 84 +#define RS6000_FCHMOD_FIXIDX 85 tSCC zRs6000_FchmodName[] = "rs6000_fchmod"; @@ -3513,7 +3557,7 @@ static const char* apzRs6000_FchmodPatch[] = { * * Description of Rs6000_Param fix */ -#define RS6000_PARAM_FIXIDX 85 +#define RS6000_PARAM_FIXIDX 86 tSCC zRs6000_ParamName[] = "rs6000_param"; @@ -3549,7 +3593,7 @@ static const char* apzRs6000_ParamPatch[] = { * * Description of Sco_Static_Func fix */ -#define SCO_STATIC_FUNC_FIXIDX 86 +#define SCO_STATIC_FUNC_FIXIDX 87 tSCC zSco_Static_FuncName[] = "sco_static_func"; @@ -3593,7 +3637,7 @@ extern \"C\" {\\\n\ * * Description of Strict_Ansi_Not fix */ -#define STRICT_ANSI_NOT_FIXIDX 87 +#define STRICT_ANSI_NOT_FIXIDX 88 tSCC zStrict_Ansi_NotName[] = "strict_ansi_not"; @@ -3628,7 +3672,7 @@ static const char* apzStrict_Ansi_NotPatch[] = { * * Description of Strict_Ansi_Not_Ctd fix */ -#define STRICT_ANSI_NOT_CTD_FIXIDX 88 +#define STRICT_ANSI_NOT_CTD_FIXIDX 89 tSCC zStrict_Ansi_Not_CtdName[] = "strict_ansi_not_ctd"; @@ -3664,7 +3708,7 @@ static const char* apzStrict_Ansi_Not_CtdPatch[] = { * * Description of Strict_Ansi_Only fix */ -#define STRICT_ANSI_ONLY_FIXIDX 89 +#define STRICT_ANSI_ONLY_FIXIDX 90 tSCC zStrict_Ansi_OnlyName[] = "strict_ansi_only"; @@ -3699,7 +3743,7 @@ static const char* apzStrict_Ansi_OnlyPatch[] = { * * Description of Sco_Utime fix */ -#define SCO_UTIME_FIXIDX 90 +#define SCO_UTIME_FIXIDX 91 tSCC zSco_UtimeName[] = "sco_utime"; @@ -3737,7 +3781,7 @@ static const char* apzSco_UtimePatch[] = { * * Description of Statsswtch fix */ -#define STATSSWTCH_FIXIDX 91 +#define STATSSWTCH_FIXIDX 92 tSCC zStatsswtchName[] = "statsswtch"; @@ -3773,7 +3817,7 @@ static const char* apzStatsswtchPatch[] = { * * Description of Stdio_Stdarg_H fix */ -#define STDIO_STDARG_H_FIXIDX 92 +#define STDIO_STDARG_H_FIXIDX 93 tSCC zStdio_Stdarg_HName[] = "stdio_stdarg_h"; @@ -3810,7 +3854,7 @@ static const char* apzStdio_Stdarg_HPatch[] = { * * Description of Stdio_Va_List fix */ -#define STDIO_VA_LIST_FIXIDX 93 +#define STDIO_VA_LIST_FIXIDX 94 tSCC zStdio_Va_ListName[] = "stdio_va_list"; @@ -3855,7 +3899,7 @@ s@_Va_LIST@_VA_LIST@", * * Description of Struct_File fix */ -#define STRUCT_FILE_FIXIDX 94 +#define STRUCT_FILE_FIXIDX 95 tSCC zStruct_FileName[] = "struct_file"; @@ -3892,7 +3936,7 @@ static const char* apzStruct_FilePatch[] = { * * Description of Struct_Sockaddr fix */ -#define STRUCT_SOCKADDR_FIXIDX 95 +#define STRUCT_SOCKADDR_FIXIDX 96 tSCC zStruct_SockaddrName[] = "struct_sockaddr"; @@ -3936,7 +3980,7 @@ static const char* apzStruct_SockaddrPatch[] = { * * Description of Sun_Auth_Proto fix */ -#define SUN_AUTH_PROTO_FIXIDX 96 +#define SUN_AUTH_PROTO_FIXIDX 97 tSCC zSun_Auth_ProtoName[] = "sun_auth_proto"; @@ -3977,7 +4021,7 @@ static const char* apzSun_Auth_ProtoPatch[] = { * * Description of Sun_Bogus_Ifdef fix */ -#define SUN_BOGUS_IFDEF_FIXIDX 97 +#define SUN_BOGUS_IFDEF_FIXIDX 98 tSCC zSun_Bogus_IfdefName[] = "sun_bogus_ifdef"; @@ -4013,7 +4057,7 @@ static const char* apzSun_Bogus_IfdefPatch[] = { * * Description of Sun_Catmacro fix */ -#define SUN_CATMACRO_FIXIDX 98 +#define SUN_CATMACRO_FIXIDX 99 tSCC zSun_CatmacroName[] = "sun_catmacro"; @@ -4053,7 +4097,7 @@ static const char* apzSun_CatmacroPatch[] = { * * Description of Sun_Malloc fix */ -#define SUN_MALLOC_FIXIDX 99 +#define SUN_MALLOC_FIXIDX 100 tSCC zSun_MallocName[] = "sun_malloc"; @@ -4084,7 +4128,7 @@ static const char* apzSun_MallocPatch[] = { "sed", * * Description of Sun_Rusers_Semi fix */ -#define SUN_RUSERS_SEMI_FIXIDX 100 +#define SUN_RUSERS_SEMI_FIXIDX 101 tSCC zSun_Rusers_SemiName[] = "sun_rusers_semi"; @@ -4119,7 +4163,7 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed", * * Description of Sun_Signal fix */ -#define SUN_SIGNAL_FIXIDX 101 +#define SUN_SIGNAL_FIXIDX 102 tSCC zSun_SignalName[] = "sun_signal"; @@ -4159,7 +4203,7 @@ void\t(*signal(...))(...);\n\ * * Description of Sunos_Matherr_Decl fix */ -#define SUNOS_MATHERR_DECL_FIXIDX 102 +#define SUNOS_MATHERR_DECL_FIXIDX 103 tSCC zSunos_Matherr_DeclName[] = "sunos_matherr_decl"; @@ -4202,7 +4246,7 @@ static const char* apzSunos_Matherr_DeclPatch[] = { * * Description of Sunos_Strlen fix */ -#define SUNOS_STRLEN_FIXIDX 103 +#define SUNOS_STRLEN_FIXIDX 104 tSCC zSunos_StrlenName[] = "sunos_strlen"; @@ -4238,7 +4282,7 @@ static const char* apzSunos_StrlenPatch[] = { * * Description of Svr4__P fix */ -#define SVR4__P_FIXIDX 104 +#define SVR4__P_FIXIDX 105 tSCC zSvr4__PName[] = "svr4__p"; @@ -4276,7 +4320,7 @@ static const char* apzSvr4__PPatch[] = { * * Description of Svr4_Getcwd fix */ -#define SVR4_GETCWD_FIXIDX 105 +#define SVR4_GETCWD_FIXIDX 106 tSCC zSvr4_GetcwdName[] = "svr4_getcwd"; @@ -4312,7 +4356,7 @@ static const char* apzSvr4_GetcwdPatch[] = { * * Description of Svr4_Profil fix */ -#define SVR4_PROFIL_FIXIDX 106 +#define SVR4_PROFIL_FIXIDX 107 tSCC zSvr4_ProfilName[] = "svr4_profil"; @@ -4348,7 +4392,7 @@ static const char* apzSvr4_ProfilPatch[] = { * * Description of Gnu_Types fix */ -#define GNU_TYPES_FIXIDX 107 +#define GNU_TYPES_FIXIDX 108 tSCC zGnu_TypesName[] = "gnu_types"; @@ -4390,7 +4434,7 @@ static const char* apzGnu_TypesPatch[] = { * * Description of Sysv68_String fix */ -#define SYSV68_STRING_FIXIDX 108 +#define SYSV68_STRING_FIXIDX 109 tSCC zSysv68_StringName[] = "sysv68_string"; @@ -4427,7 +4471,7 @@ extern unsigned int\\\n\ * * Description of Sysz_Stdlib_For_Sun fix */ -#define SYSZ_STDLIB_FOR_SUN_FIXIDX 109 +#define SYSZ_STDLIB_FOR_SUN_FIXIDX 110 tSCC zSysz_Stdlib_For_SunName[] = "sysz_stdlib_for_sun"; @@ -4463,7 +4507,7 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = { * * Description of Tinfo_Cplusplus fix */ -#define TINFO_CPLUSPLUS_FIXIDX 110 +#define TINFO_CPLUSPLUS_FIXIDX 111 tSCC zTinfo_CplusplusName[] = "tinfo_cplusplus"; @@ -4499,7 +4543,7 @@ static const char* apzTinfo_CplusplusPatch[] = { * * Description of Ultrix_Atof_Param fix */ -#define ULTRIX_ATOF_PARAM_FIXIDX 111 +#define ULTRIX_ATOF_PARAM_FIXIDX 112 tSCC zUltrix_Atof_ParamName[] = "ultrix_atof_param"; @@ -4535,7 +4579,7 @@ static const char* apzUltrix_Atof_ParamPatch[] = { * * Description of Ultrix_Const fix */ -#define ULTRIX_CONST_FIXIDX 112 +#define ULTRIX_CONST_FIXIDX 113 tSCC zUltrix_ConstName[] = "ultrix_const"; @@ -4572,7 +4616,7 @@ static const char* apzUltrix_ConstPatch[] = { * * Description of Ultrix_Const2 fix */ -#define ULTRIX_CONST2_FIXIDX 113 +#define ULTRIX_CONST2_FIXIDX 114 tSCC zUltrix_Const2Name[] = "ultrix_const2"; @@ -4609,7 +4653,7 @@ static const char* apzUltrix_Const2Patch[] = { * * Description of Ultrix_Fix_Fixproto fix */ -#define ULTRIX_FIX_FIXPROTO_FIXIDX 114 +#define ULTRIX_FIX_FIXPROTO_FIXIDX 115 tSCC zUltrix_Fix_FixprotoName[] = "ultrix_fix_fixproto"; @@ -4647,7 +4691,7 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = { * * Description of Ultrix_Ifdef fix */ -#define ULTRIX_IFDEF_FIXIDX 115 +#define ULTRIX_IFDEF_FIXIDX 116 tSCC zUltrix_IfdefName[] = "ultrix_ifdef"; @@ -4683,7 +4727,7 @@ static const char* apzUltrix_IfdefPatch[] = { * * Description of Ultrix_Math_Ifdef fix */ -#define ULTRIX_MATH_IFDEF_FIXIDX 116 +#define ULTRIX_MATH_IFDEF_FIXIDX 117 tSCC zUltrix_Math_IfdefName[] = "ultrix_math_ifdef"; @@ -4719,7 +4763,7 @@ static const char* apzUltrix_Math_IfdefPatch[] = { * * Description of Ultrix_Nested_Ioctl fix */ -#define ULTRIX_NESTED_IOCTL_FIXIDX 117 +#define ULTRIX_NESTED_IOCTL_FIXIDX 118 tSCC zUltrix_Nested_IoctlName[] = "ultrix_nested_ioctl"; @@ -4754,7 +4798,7 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed", * * Description of Ultrix_Nested_Svc fix */ -#define ULTRIX_NESTED_SVC_FIXIDX 118 +#define ULTRIX_NESTED_SVC_FIXIDX 119 tSCC zUltrix_Nested_SvcName[] = "ultrix_nested_svc"; @@ -4789,7 +4833,7 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed", * * Description of Ultrix_Stat fix */ -#define ULTRIX_STAT_FIXIDX 119 +#define ULTRIX_STAT_FIXIDX 120 tSCC zUltrix_StatName[] = "ultrix_stat"; @@ -4830,7 +4874,7 @@ static const char* apzUltrix_StatPatch[] = { "sed", * * Description of Ultrix_Static fix */ -#define ULTRIX_STATIC_FIXIDX 120 +#define ULTRIX_STATIC_FIXIDX 121 tSCC zUltrix_StaticName[] = "ultrix_static"; @@ -4867,7 +4911,7 @@ static const char* apzUltrix_StaticPatch[] = { "sed", * * Description of Ultrix_Strings fix */ -#define ULTRIX_STRINGS_FIXIDX 121 +#define ULTRIX_STRINGS_FIXIDX 122 tSCC zUltrix_StringsName[] = "ultrix_strings"; @@ -4902,7 +4946,7 @@ static const char* apzUltrix_StringsPatch[] = { * * Description of Undefine_Null fix */ -#define UNDEFINE_NULL_FIXIDX 122 +#define UNDEFINE_NULL_FIXIDX 123 tSCC zUndefine_NullName[] = "undefine_null"; @@ -4948,7 +4992,7 @@ static const char* apzUndefine_NullPatch[] = { * * Description of Uw7_Byteorder_Fix fix */ -#define UW7_BYTEORDER_FIX_FIXIDX 123 +#define UW7_BYTEORDER_FIX_FIXIDX 124 tSCC zUw7_Byteorder_FixName[] = "uw7_byteorder_fix"; @@ -4999,7 +5043,7 @@ static const char* apzUw7_Byteorder_FixPatch[] = { * * Description of Va_I960_Macro fix */ -#define VA_I960_MACRO_FIXIDX 124 +#define VA_I960_MACRO_FIXIDX 125 tSCC zVa_I960_MacroName[] = "va_i960_macro"; @@ -5035,7 +5079,7 @@ static const char* apzVa_I960_MacroPatch[] = { * * Description of Void_Null fix */ -#define VOID_NULL_FIXIDX 125 +#define VOID_NULL_FIXIDX 126 tSCC zVoid_NullName[] = "void_null"; @@ -5071,7 +5115,7 @@ static const char* apzVoid_NullPatch[] = { * * Description of Vxworks_Gcc_Problem fix */ -#define VXWORKS_GCC_PROBLEM_FIXIDX 126 +#define VXWORKS_GCC_PROBLEM_FIXIDX 127 tSCC zVxworks_Gcc_ProblemName[] = "vxworks_gcc_problem"; @@ -5121,7 +5165,7 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed", * * Description of Vxworks_Needs_Vxtypes fix */ -#define VXWORKS_NEEDS_VXTYPES_FIXIDX 127 +#define VXWORKS_NEEDS_VXTYPES_FIXIDX 128 tSCC zVxworks_Needs_VxtypesName[] = "vxworks_needs_vxtypes"; @@ -5157,7 +5201,7 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = { * * Description of Vxworks_Needs_Vxworks fix */ -#define VXWORKS_NEEDS_VXWORKS_FIXIDX 128 +#define VXWORKS_NEEDS_VXWORKS_FIXIDX 129 tSCC zVxworks_Needs_VxworksName[] = "vxworks_needs_vxworks"; @@ -5206,7 +5250,7 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed", * * Description of Vxworks_Time fix */ -#define VXWORKS_TIME_FIXIDX 129 +#define VXWORKS_TIME_FIXIDX 130 tSCC zVxworks_TimeName[] = "vxworks_time"; @@ -5257,7 +5301,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\ * * Description of X11_Class fix */ -#define X11_CLASS_FIXIDX 130 +#define X11_CLASS_FIXIDX 131 tSCC zX11_ClassName[] = "x11_class"; @@ -5304,7 +5348,7 @@ static const char* apzX11_ClassPatch[] = { * * Description of X11_Class_Usage fix */ -#define X11_CLASS_USAGE_FIXIDX 131 +#define X11_CLASS_USAGE_FIXIDX 132 tSCC zX11_Class_UsageName[] = "x11_class_usage"; @@ -5347,7 +5391,7 @@ static const char* apzX11_Class_UsagePatch[] = { * * Description of X11_New fix */ -#define X11_NEW_FIXIDX 132 +#define X11_NEW_FIXIDX 133 tSCC zX11_NewName[] = "x11_new"; @@ -5388,7 +5432,7 @@ static const char* apzX11_NewPatch[] = { "sed", * * Description of X11_Sprintf fix */ -#define X11_SPRINTF_FIXIDX 133 +#define X11_SPRINTF_FIXIDX 134 tSCC zX11_SprintfName[] = "x11_sprintf"; @@ -5427,9 +5471,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 140 +#define REGEX_COUNT 142 #define MACH_LIST_SIZE_LIMIT 279 -#define FIX_COUNT 134 +#define FIX_COUNT 135 tFixDesc fixDescList[ FIX_COUNT ] = { { zAaa_Ki_IfaceName, zAaa_Ki_IfaceList, @@ -5627,6 +5671,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, aDec_Intern_AsmTests, apzDec_Intern_AsmPatch, 0 }, + { zDjgpp_Wchar_HName, zDjgpp_Wchar_HList, + apzDjgpp_Wchar_HMachs, + DJGPP_WCHAR_H_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDjgpp_Wchar_HTests, apzDjgpp_Wchar_HPatch, 0 }, + { zEcd_CursorName, zEcd_CursorList, apzEcd_CursorMachs, ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index bc43c3c..192c89a 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -1000,6 +1000,20 @@ fix = { /* + * Fix typo in on DJGPP 2.03. + */ +fix = { + hackname = djgpp_wchar_h; + file = wchar.h; + select = "__DJ_wint_t"; + bypass = "sys/djtypes.h"; + c_fix = format; + c_fix_arg = "%0\n#include "; + c_fix_arg = "#include "; + test_text = "__DJ_wint_t\n#undef __DJ_wint_t\n#define __DJ_wint_t"; +}; + +/* * Fix these Sun OS files to avoid an invalid identifier in an #ifdef. */ fix = { -- cgit v1.1