This is the mail archive of the gcc@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]

Need some help with fixincludes.


Hi,

FX Coudert has sent me the following patch for fixincludes/inclhack.def:

--- ../_gcc_clean/fixincludes/inclhack.def	2009-03-31 22:37:57.000000000 +0200
+++ fixincludes/inclhack.def	2009-04-06 19:50:43.000000000 +0200
@@ -1023,6 +1023,35 @@
 
 
 /*
+ *  Fix stdint.h header on Darwin.
+ */
+fix = {
+    hackname  = darwin_stdint;
+    files     = stdint.h;
+    sed = "/#define[ \t]+INTPTR_MIN[\t]+INT64_MIN/#define INTPTR_MIN ((intptr_t) INT64_MIN)/";
+    sed = "/#define[ \t]+INTPTR_MIN[\t]+INT32_MIN/#define INTPTR_MIN ((intptr_t) INT32_MIN)/";
+    sed = "/#define[ \t]+INTPTR_MAX[\t]+INT64_MAX/#define INTPTR_MAX ((intptr_t) INT64_MAX)/";
+    sed = "/#define[ \t]+INTPTR_MAX[\t]+INT32_MAX/#define INTPTR_MAX ((intptr_t) INT32_MAX)/";
+    sed = "/#define[ \t]+UINTPTR_MIN[\t]+INT64_MIN/#define UINTPTR_MIN ((uintptr_t) INT64_MIN)/";
+    sed = "/#define[ \t]+UINTPTR_MIN[\t]+INT32_MIN/#define UINTPTR_MIN ((uintptr_t) INT32_MIN)/";
+    sed = "/#define[ \t]+UINTPTR_MAX[\t]+INT64_MAX/#define UINTPTR_MAX ((uintptr_t) INT64_MAX)/";
+    sed = "/#define[ \t]+UINTPTR_MAX[\t]+INT32_MAX/#define UINTPTR_MAX ((uintptr_t) INT32_MAX)/";
+    sed = "/#define[ \t]+SIZE_MAX[\t]+INT32_MAX/#define SIZE_MAX ((size_t) INT32_MAX)/";
+    sed = "/#define[ \t]+SIZE_MAX[\t]+INT64_MAX/#define SIZE_MAX ((size_t) INT64_MAX)/";
+    sed = "/#define[ \t]+UINT8_C(v)[\t]+(v ## U)/#define[\t]+UINT8_C(v) (v)/";
+    sed = "/#define[ \t]+UINT16_C(v)[\t]+(v ## U)/#define[\t]+UINT16_C(v) (v)/";
+    test_text = "#define INTPTR_MIN        INT64_MIN\n"
+		"#define INTPTR_MAX        INT64_MAX\n"
+		"#define UINTPTR_MIN       UINT64_MIN\n"
+		"#define UINTPTR_MAX       UINT64_MAX\n"
+		"#define SIZE_MAX          UINT64_MAX\n"
+		"#define UINT8_C(v)   (v ## U)\n"
+		"#define UINT16_C(v)  (v ## U)\n";
+
+};
+
+
+/*
  *  Fix <c_asm.h> on Digital UNIX V4.0:
  *  It contains a prototype for a DEC C internal asm() function,
  *  clashing with gcc's asm keyword.  So protect this with __DECC.

I have succeeded to regenerate fixincludes/fixincl.x using fixincludes/genfixes.
After that, I bootstrapped without problem, but the test gcc.dg/c99-stdint-1.c
is still broken and if I run "make check" in <build-dir>/fixincludes I get

...
Fixed:  wchar.h
Missing header fix:  stdint.h

There were fixinclude test FAILURES
make: *** [check] Error 1

Is the FX's patch correct? If no, what should I change? If yes, what did I miss?

TIA

Dominique


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