From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21964 invoked by alias); 17 Dec 2001 20:34:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 20273 invoked from network); 17 Dec 2001 20:33:42 -0000 Received: from unknown (HELO hiauly1.hia.nrc.ca) (132.246.100.193) by sources.redhat.com with SMTP; 17 Dec 2001 20:33:42 -0000 Received: from hiauly1.hia.nrc.ca (localhost [127.0.0.1]) by hiauly1.hia.nrc.ca (8.12.0.Beta16/8.12.0.Beta16) with ESMTP id fBHKXd7c001304; Mon, 17 Dec 2001 15:33:40 -0500 (EST) Received: (from dave@localhost) by hiauly1.hia.nrc.ca (8.12.0.Beta16/8.12.0.Beta16) id fBHKXcHK001303; Mon, 17 Dec 2001 15:33:38 -0500 (EST) Message-Id: <200112172033.fBHKXcHK001303@hiauly1.hia.nrc.ca> Subject: Re: HPUX 11 "size_t" fixinc problems To: bkorb@veritas.com (Bruce Korb) Date: Mon, 17 Dec 2001 12:39:00 -0000 From: "John David Anglin" Cc: dave.anglin@nrc.ca, gcc-patches@gcc.gnu.org, gcc@gcc.gnu.org In-Reply-To: <3C0BBE7B.AF93077@veritas.com> from "Bruce Korb" at Dec 3, 2001 10:03:39 am X-Mailer: ELM [version 2.4 PL25] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SW-Source: 2001-12/txt/msg01948.txt.bz2 > Excellent. I applied this to the 3.0 branch before Friday's freeze. > I intend to apply a slightly different one to the main line, > barring complaints. On the theory that all of the "empty replacement" > fixes are really fixes for the broken fixincludes script, my > _guess_ is that they are not needed any more because my version > doesn't make mistakes. ;-) I have tested the following under hpux 11.00 and 11.11. No fixes were applied to any of the sys/ki*.h headers in either case. So, I am happy with the removal of the the AAA_ki* fixes on the main. Dave -- J. David Anglin dave.anglin@nrc.ca National Research Council of Canada (613) 990-0752 (FAX: 952-6605) 2001-12-17 John David Anglin * inclhack.def (AAA_ki, AAA_ki_calls, AAA_ki_defs, AAA_ki_iface, AAA_time): Delete. (hpux_size_t): Revise select and fix for HP-UX 11.11. (hpux11_vsnprintf): Likewise. --- inclhack.def.orig Thu Dec 6 21:55:49 2001 +++ inclhack.def Sun Dec 16 12:51:08 2001 @@ -39,50 +39,6 @@ /* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_ki; - files = sys/ki.h; - select = '11.00 HP-UX LP64'; - replace; /* empty replacement -> no fixing the file */ -}; - - -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_ki_calls; - files = sys/ki_calls.h; - select = 'kthread_create_caller_t'; - replace; /* empty replacement -> no fixing the file */ -}; - - -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_ki_defs; - files = sys/ki_defs.h; - select = 'Kernel Instrumentation Definitions'; - replace; /* empty replacement -> no fixing the file */ -}; - - -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_ki_iface; - files = sys/ki_iface.h; - select = 'These definitions are for HP Internal developers'; - replace; /* empty replacement -> no fixing the file */ -}; - - -/* * Tru64 UNIX V4.0F/V5.1 defines _NO_PROTO and _NONSTD_TYPES * correctly for GCC, but strict_ansi_not breaks it. */ @@ -94,16 +50,6 @@ }; -/* - * Purge some HP-UX 11 files that are only broken after they are "fixed". - */ -fix = { - hackname = AAA_time; - files = sys/time.h; - select = '11.0 and later representation of ki time'; - replace; /* empty replacement -> no fixing the file */ -}; - /* And now, the real fixes, replacement text fixes first: */ /* @@ -1222,12 +1168,11 @@ */ fix = { hackname = hpux11_size_t; - mach = "*-hp-hpux*"; - select = "^#define __size_t size_t"; + mach = "*-hp-hpux11*"; + select = "__size_t"; c_fix = format; c_fix_arg = "_hpux_size_t"; - c_fix_arg = "__size_t"; test_text = "#define __size_t size_t\n" @@ -1264,17 +1209,17 @@ /* - * Fix hpux 11.00 broken vsnprintf declaration + * Fix hpux 11.00 broken vsnprintf declaration. */ fix = { hackname = hpux11_vsnprintf; files = stdio.h; - select = 'extern int vsnprintf\(char \*, __size_t, const char \*,' + select = 'extern int vsnprintf\(char \*, .*_size_t, const char \*,' ' __va__list\);'; c_fix = format; - c_fix_arg = "extern int vsnprintf(char *, __size_t, const char *," - " __va_list);"; + c_fix_arg = __va_list; + c_fix_arg = __va__list; test_text = 'extern int vsnprintf(char *, __size_t, const char *,' ' __va__list);';