QNX needs a bypass for limits_ifndefs

From-SVN: r61417

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 476256f..c930d83 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-16  Bruce Korb  <bkorb@gnu.org>
+
+       * gcc/fixinc/inclhack.def(limits_ifndef): QNX needs a bypass, too.
+
 2003-01-16  Kaz Kojima  <kkojima@gcc.gnu.org>
 
         * config/sh/sh.c (sh_initialize_trampoline): Emit rotrdi3_mextr

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index b2bd70d..4f159e1 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -296,10 +296,10 @@ fix = {\n\
     replace  = <<-  _EndOfHeader_\n\
 #ifndef _SYS_BYTEORDER_H\n\
 #define _SYS_BYTEORDER_H\n\n\
-/* Functions to convert `short\\' and `long\\' quantities from host byte order\n\
+/* Functions to convert `short' and `long' quantities from host byte order\n\
    to (internet) network byte order (i.e. big-endian).\n\n\
    Written by Ron Guilmette (rfg@ncd.com).\n\n\
-   This isn\\'t actually used by GCC.  It is installed by fixinc.svr4.\n\n\
+   This isn't actually used by GCC.  It is installed by fixinc.svr4.\n\n\
    For big-endian machines these functions are essentially no-ops.\n\n\
    For little-endian machines, we define the functions using specialized\n\
    asm sequences in cases where doing so yields better code (e.g. i386).  */\n\n\
@@ -2423,7 +2423,7 @@ tSCC zLimits_IfndefsList[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zLimits_IfndefsBypass0[] =
-       "ifndef[ \t]+FLT_MIN";
+       "ifndef[ \t]+FLT_(MIN|MAX)";
 
 #define    LIMITS_IFNDEFS_TEST_CT  1
 static tTestDesc aLimits_IfndefsTests[] = {

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 3e7d818..fc39fbb 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1398,12 +1398,16 @@ fix = {
  *  comment.  Fortunately, HP/UX already uses #ifndefs in limits.h; if
  *  we find a #ifndef FLT_MIN we assume that all the required #ifndefs
  *  are there, and we do not add them ourselves.
+ *
+ *  QNX Software Systems also guards the defines, but doesn't define
+ *  FLT_MIN.  Therefore, bypass the fix for *either* guarded FLT_MIN
+ *  or guarded FLT_MAX.
  */
 fix = {
     hackname = limits_ifndefs;
     files  = "sys/limits.h";
     files  = "limits.h";
-    bypass = "ifndef[ \t]+FLT_MIN";
+    bypass = "ifndef[ \t]+FLT_(MIN|MAX)";
 
     c_fix     = format;
     c_fix_arg = "#ifndef %1\n%0\n#endif";