From 1435059ed6a350120f5af82790c259b2e32cdc6b Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Tue, 5 Dec 2000 18:08:09 +0000 Subject: [PATCH] mkfixinc.sh (*-gnu*): activate fixinc for GNU/Hurd and GNU/Linux. * fixinc/mkfixinc.sh(*-gnu*): activate fixinc for GNU/Hurd and GNU/Linux. * 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. From-SVN: r38044 --- gcc/ChangeLog | 12 ++++++++++++ gcc/fixinc/fixincl.x | 3 +-- gcc/fixinc/inclhack.def | 4 +++- gcc/fixinc/mkfixinc.sh | 3 --- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7fad8ade3155..89b91200c521 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2000-12-05 Bruce Korb + + * fixinc/mkfixinc.sh(*-gnu*): activate fixinc for GNU/Hurd and + GNU/Linux. + +2000-12-05 Richard Earnshaw + + * 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. + 2000-12-05 Bernd Schmidt * sched-vis.c: Guard with #ifdef INSN_SCHEDULING. diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 9942790113e9..533f795ab73a 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2648,8 +2648,7 @@ tSCC zMachine_Ansi_H_Va_ListName[] = /* * File name selection pattern */ -tSCC zMachine_Ansi_H_Va_ListList[] = - "|machine/ansi.h|"; +#define zMachine_Ansi_H_Va_ListList (char*)NULL /* * Machine/OS name selection pattern */ diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 1b73f0c11d4f..41ee2cda7684 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -1475,10 +1475,12 @@ fix = { /* * 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; - files = machine/ansi.h; select = "define[ \t]+_BSD_VA_LIST_[ \t]"; bypass = '__builtin_va_list'; diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh index 3e60389f3af3..ec9cdbcb985e 100755 --- a/gcc/fixinc/mkfixinc.sh +++ b/gcc/fixinc/mkfixinc.sh @@ -50,7 +50,6 @@ case $machine in fixincludes=fixinc.interix ;; - *-*-netbsd* | \ i?86-*-openbsd*) fixincludes=fixinc.wrap ;; @@ -67,14 +66,12 @@ case $machine in alpha*-dec-vms* | \ arm-semi-aout | armel-semi-aout | \ arm-semi-aof | armel-semi-aof | \ - arm-*-gnu* | \ c*-convex-* | \ hppa1.1-*-osf* | \ hppa1.0-*-osf* | \ hppa1.1-*-bsd* | \ hppa1.0-*-bsd* | \ hppa*-*-lites* | \ - *-*-gnu* | \ i?86-moss-msdos* | i?86-*-moss* | \ i?86-*-osf1* | \ i?86-*-win32 | \ -- 2.47.2