This is the mail archive of the
gcc-bugs@gcc.gnu.org
mailing list for the GCC project.
Re: Another fixincludes problem
- To: gcc-patches at gcc dot gnu dot org
- Subject: Re: Another fixincludes problem
- From: Richard Earnshaw <rearnsha at arm dot com>
- Date: Tue, 05 Dec 2000 17:25:14 +0000
- cc: bkorb at cruzio dot com, gcc-bugs at gcc dot gnu dot org, rearnsha at arm dot com
- Organization: ARM Ltd.
- Reply-To: rearnsha at arm dot com
>
> bkorb@cruzio.com said:
> > We could also *remove* the ``files'' entry. That would run the fix on
> > every file found to have the ``select'' expression and *not* the
> > ``bypass'' expression:
>
> Despite its expense, I think this is much cleaner -- since it means we
> don't have to know the list of machines NetBSD has been ported to (a
> moving target).
>
> Unless someone else objects, I'll generate a patch based on this.
>
> R.
>
2000-12-05 Richard Earnshaw <rearnsha@arm.com>
* fixinc/mkfixinc.sh: Run fixinc on netbsd.
* fixinc/inclhack.def (machine/ansi.h): Run this rule on all files,
to cope with aliased copies.
* fixinc/fixincl.x: Regenerate.
Index: fixincl.x
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/fixincl.x,v
retrieving revision 1.94
diff -p -r1.94 fixincl.x
*** fixincl.x 2000/11/30 16:43:00 1.94
--- fixincl.x 2000/12/05 17:20:09
*************** tSCC zMachine_Ansi_H_Va_ListName[] =
*** 2648,2655 ****
/*
* File name selection pattern
*/
! tSCC zMachine_Ansi_H_Va_ListList[] =
! "|machine/ansi.h|";
/*
* Machine/OS name selection pattern
*/
--- 2648,2654 ----
/*
* File name selection pattern
*/
! #define zMachine_Ansi_H_Va_ListList (char*)NULL
/*
* Machine/OS name selection pattern
*/
Index: inclhack.def
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/inclhack.def,v
retrieving revision 1.97
diff -p -r1.97 inclhack.def
*** inclhack.def 2000/11/30 16:42:18 1.97
--- inclhack.def 2000/12/05 17:20:09
*************** fix = {
*** 1475,1484 ****
/*
* Fix BSD machine/ansi.h to use __builtin_va_list to define _BSD_VA_LIST_.
*/
fix = {
hackname = machine_ansi_h_va_list;
- files = machine/ansi.h;
select = "define[ \t]+_BSD_VA_LIST_[ \t]";
bypass = '__builtin_va_list';
--- 1475,1486 ----
/*
* Fix BSD machine/ansi.h to use __builtin_va_list to define _BSD_VA_LIST_.
+ *
+ * On NetBSD, machine is a symbolic link to an architecture specific
+ * directory name, so we can't match a specific file name here.
*/
fix = {
hackname = machine_ansi_h_va_list;
select = "define[ \t]+_BSD_VA_LIST_[ \t]";
bypass = '__builtin_va_list';
Index: mkfixinc.sh
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/mkfixinc.sh,v
retrieving revision 1.32
diff -p -r1.32 mkfixinc.sh
*** mkfixinc.sh 2000/12/03 20:40:17 1.32
--- mkfixinc.sh 2000/12/05 17:20:09
*************** case $machine in
*** 53,59 ****
fixincludes=fixinc.interix
;;
- *-*-netbsd* | \
i?86-*-openbsd*)
fixincludes=fixinc.wrap
;;
--- 53,58 ----