Merge with trunk.

[thirdparty/gcc.git] / gcc / config / msp430 / msp430.c

diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 1ebb583c1ed075b949e8641ec80b460ebadf1719..6648cacb68c1811252cf937883ee18c886c8d159 100644 (file)
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -1083,7 +1083,7 @@ msp430_attr (tree * node,
          break;
 
        case INTEGER_CST:
-         if (TREE_INT_CST_LOW (value) > 31)
+         if (wi::gtu_p (value, 31))
            /* Allow the attribute to be added - the linker script
               being used may still recognise this value.  */
            warning (OPT_Wattributes,
@@ -1157,7 +1157,7 @@ msp430_start_function (FILE *file, const char *name, tree decl)
                     TREE_STRING_POINTER (intr_vector));
          else /* TREE_CODE (intr_vector) == INTEGER_CST */
            sprintf (buf, "__interrupt_vector_%u",
-                    (unsigned int) TREE_INT_CST_LOW (intr_vector));
+                    (unsigned int) tree_to_hwi (intr_vector));
 
          switch_to_section (get_section (buf, SECTION_CODE, decl));
          fputs ("\t.word\t", file);