This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: HPUX 11 "size_t" fixinc problems
- From: "John David Anglin" <dave at hiauly1 dot hia dot nrc dot ca>
- To: bkorb at veritas dot com (Bruce Korb)
- Cc: dave dot anglin at nrc dot ca, gcc-patches at gcc dot gnu dot org, gcc at gcc dot gnu dot org
- Date: Mon, 17 Dec 2001 15:33:38 -0500 (EST)
- Subject: Re: HPUX 11 "size_t" fixinc problems
> 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 <dave@hiauly1.hia.nrc.ca>
* 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 <standards.h> 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);';