Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / opth-gen.awk

diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk
index 876e0f6..541bc3e 100644 (file)
--- a/gcc/opth-gen.awk
+++ b/gcc/opth-gen.awk
@@ -127,7 +127,7 @@ print ""
 # Also, order the structure so that pointer fields occur first, then int
 # fields, and then char fields to provide the best packing.
 
-print "#if !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS)"
+print "#if !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS) && !defined(IN_RTS)"
 print ""
 print "/* Structure to save/restore optimization and target specific options.  */";
 print "struct GTY(()) cl_optimization";
@@ -300,18 +300,26 @@ for (i = 0; i < n_opts; i++) {
        name = opt_args("Mask", flags[i])
        vname = var_name(flags[i])
        mask = "MASK_"
+       mask_1 = "1"
        if (vname != "") {
                mask = "OPTION_MASK_"
+               if (host_wide_int[vname] == "yes")
+                       mask_1 = "HOST_WIDE_INT_1"
        }
        if (name != "" && !flag_set_p("MaskExists", flags[i]))
-               print "#define " mask name " (1 << " masknum[vname]++ ")"
+               print "#define " mask name " (" mask_1 " << " masknum[vname]++ ")"
 }
 for (i = 0; i < n_extra_masks; i++) {
        print "#define MASK_" extra_masks[i] " (1 << " masknum[""]++ ")"
 }
 
 for (var in masknum) {
-       if (masknum[var] > 31) {
+       if (var != "" && host_wide_int[var] == "yes") {
+               print" #if defined(HOST_BITS_PER_WIDE_INT) && " masknum[var] " >= HOST_BITS_PER_WIDE_INT"
+               print "#error too many masks for " var
+               print "#endif"
+       }
+       else if (masknum[var] > 31) {
                if (var == "")
                        print "#error too many target masks"
                else