This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: HPUX 11 "size_t" fixinc problems


> As someone said, just remove the select clause.
> The hack is already constrained to HP/UX only.
> (I've browsed the source since my last post.)

It turns out to be a little more complicated.  Had to remove the hack
that deletes sys/time.h because it uses __size_t, and fix the hack for
vsnprintf in stdio.h because it involves __size_t.  Bootstrapping the
enclosed patch now:

Dave
-- 
J. David Anglin                                  dave.anglin@nrc.ca
National Research Council of Canada              (613) 990-0752 (FAX: 952-6605)

2001-11-27  John David Anglin  <dave@hiauly1.hia.nrc.ca>

	* inclhack.def (AAA_time): Delete.
	(hpux_size_t): Revise select and fix for HP-UX 11.11.
	(hpux11_vsnprintf): Likewise.

--- inclhack.def.orig	Thu Sep 13 12:05:12 2001
+++ inclhack.def	Wed Nov 28 20:50:29 2001
@@ -94,16 +94,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 +1212,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 +1253,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);';


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]