* Makefile.am (gfor_helper_src): Split selected_kind.f90.

[pf3gnuchains/gcc-fork.git] / gcc / c-lex.c

diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 7fc47ba..4b87561 100644 (file)
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -104,7 +104,7 @@ init_c_lex (void)
 
   /* Set the debug callbacks if we can use them.  */
   if (debug_info_level == DINFO_LEVEL_VERBOSE
-      && (write_symbols == DWARF_DEBUG || write_symbols == DWARF2_DEBUG
+      && (write_symbols == DWARF2_DEBUG
           || write_symbols == VMS_AND_DWARF2_DEBUG))
     {
       cb->define = cb_define;
@@ -389,8 +389,7 @@ c_lex_with_flags (tree *value, unsigned char *cpp_flags)
            {
            case CPP_NAME:
              val = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok->val.node));
-             if (C_IS_RESERVED_WORD (val)
-                 && OBJC_IS_AT_KEYWORD (C_RID_CODE (val)))
+             if (objc_is_reserved_word (val))
                {
                  *value = val;
                  return CPP_AT_NAME;
@@ -588,11 +587,11 @@ interpret_integer (const cpp_token *token, unsigned int flags)
     pedwarn ("integer constant is too large for \"%s\" type",
             (flags & CPP_N_UNSIGNED) ? "unsigned long" : "long");
 
-  value = build_int_cst (type, integer.low, integer.high);
+  value = build_int_cst_wide (type, integer.low, integer.high);
 
   /* Convert imaginary to a complex type.  */
   if (flags & CPP_N_IMAGINARY)
-    value = build_complex (NULL_TREE, build_int_cst (type, 0, 0), value);
+    value = build_complex (NULL_TREE, build_int_cst (type, 0), value);
 
   return value;
 }
@@ -805,9 +804,9 @@ lex_charconst (const cpp_token *token)
   /* Cast to cppchar_signed_t to get correct sign-extension of RESULT
      before possibly widening to HOST_WIDE_INT for build_int_cst.  */
   if (unsignedp || (cppchar_signed_t) result >= 0)
-    value = build_int_cst (type, result, 0);
+    value = build_int_cst_wide (type, result, 0);
   else
-    value = build_int_cst (type, (cppchar_signed_t) result, -1);
+    value = build_int_cst_wide (type, (cppchar_signed_t) result, -1);
 
   return value;
 }