2009-01-09 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk r143197



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@143199 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 59 insertions, 3 deletions

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index ac3a39105fc..ca308109296 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-06  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* tests/base/locale.h: Add new test.
+	* tests/base/stdarg.h: Likewise.
+
+2009-01-05  Steve Ellcey  <sje@cup.hp.com>
+
+	* inclhack.def (hpux_spu_info):  Add files line.
+	* fixincl.x: Regenerate.
+
 2009-01-01  Andreas Tobler  <a.tobler@schweiz.org>
 
 	* inclhack.def (openbsd_null_definition): Redefine NULL to (void *)0
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 317dac698b9..2c0fa31b738 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Monday January  5, 2009 at 10:30:44 AM MET
+ * It has been AutoGen-ed  Monday January  5, 2009 at 09:53:36 AM PST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jan  5 10:30:44 MET 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jan  5 09:53:36 PST 2009
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -3133,7 +3133,7 @@ tSCC zHpux_Spu_InfoName[] =
  *  File name selection pattern
  */
 tSCC zHpux_Spu_InfoList[] =
-  "*/sys/getppdp.h\0";
+  "ia64/sys/getppdp.h\0*/sys/getppdp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index adab21ef89b..396d33ea1b2 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1756,6 +1756,13 @@ fix = {
 fix = {
     hackname = hpux_spu_info;
     mach     = "*-hp-hpux*";
+    /*
+     *  It is tempting to omit the first "files" entry.  Do not.
+     *  The testing machinery will take the first "files" entry as the name
+     *  of a test file to play with.  It would be a nuisance to have a directory
+     *  with the name "*".
+     */
+    files    = "ia64/sys/getppdp.h";
     files    = "*/sys/getppdp.h";
     select   = "^.*extern.*spu_info.*";
 
diff --git a/fixincludes/tests/base/locale.h b/fixincludes/tests/base/locale.h
new file mode 100644
index 00000000000..7a7273e1053
--- /dev/null
+++ b/fixincludes/tests/base/locale.h
@@ -0,0 +1,25 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/locale.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( OPENBSD_NULL_DEFINITION_CHECK )
+#ifndef NULL
+#ifdef __cplusplus
+#ifdef __GNUG__
+#define NULL	__null
+#else	 /* ! __GNUG__  */
+#define NULL	0L
+#endif	 /* __GNUG__  */
+#else	 /* ! __cplusplus  */
+#define NULL	((void *)0)
+#endif	 /* __cplusplus  */
+#endif	 /* !NULL  */
+
+#endif  /* OPENBSD_NULL_DEFINITION_CHECK */
diff --git a/fixincludes/tests/base/stdarg.h b/fixincludes/tests/base/stdarg.h
new file mode 100644
index 00000000000..686d0b3d6ea
--- /dev/null
+++ b/fixincludes/tests/base/stdarg.h
@@ -0,0 +1,14 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/stdarg.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( OPENBSD_VA_START_CHECK )
+#define va_start(v,l)   __builtin_va_start((v),l)
+#endif  /* OPENBSD_VA_START_CHECK */