12257 resync smatch to 0.6.1-rc1-il-4

*** 316,332 ****
  unsigned long fpasses = ~0UL;
  int funsigned_char = UNSIGNED_CHAR;
  
  int preprocess_only;
  
! static enum { STANDARD_C89,
!               STANDARD_C94,
!               STANDARD_C99,
!               STANDARD_C11,
!               STANDARD_GNU11,
!               STANDARD_GNU89,
!               STANDARD_GNU99, } standard = STANDARD_GNU89;
  
  int arch_m64 = ARCH_M64_DEFAULT;
  int arch_msize_long = 0;
  int arch_big_endian = ARCH_BIG_ENDIAN;
  int arch_mach = MACH_NATIVE;
--- 316,326 ----
  unsigned long fpasses = ~0UL;
  int funsigned_char = UNSIGNED_CHAR;
  
  int preprocess_only;
  
! enum standard standard = STANDARD_GNU89;
  
  int arch_m64 = ARCH_M64_DEFAULT;
  int arch_msize_long = 0;
  int arch_big_endian = ARCH_BIG_ENDIAN;
  int arch_mach = MACH_NATIVE;
*** 1311,1320 ****
--- 1305,1316 ----
          if (optimize_level)
                  predefine("__OPTIMIZE__", 0, "1");
          if (optimize_size)
                  predefine("__OPTIMIZE_SIZE__", 0, "1");
  
+         predefine("__PRAGMA_REDEFINE_EXTNAME", 1, "1");
+ 
          // Temporary hacks
          predefine("__extension__", 0, NULL);
          predefine("__pragma__", 0, NULL);
  
          switch (arch_m64) {
*** 1324,1334 ****
                  predefine("__ILP32__", 1, "1");
                  predefine("_ILP32", 1, "1");
                  break;
          case ARCH_LP64:
                  predefine("__LP64__", 1, "1");
-                 predefine("__LP64", 1, "1");
                  predefine("_LP64", 1, "1");
                  break;
          case ARCH_LLP64:
                  predefine("__LLP64__", 1, "1");
                  break;
--- 1320,1329 ----
*** 1387,1422 ****
                  }
                  /* fall-through */
          case MACH_SPARC32:
                  predefine("__sparc__", 1, "1");
                  predefine("__sparc", 1, "1");
                  break;
          case MACH_X86_64:
                  if (arch_m64 != ARCH_LP32) {
                          predefine("__x86_64__", 1, "1");
                          predefine("__x86_64", 1, "1");
                          break;
                  }
                  /* fall-through */
          case MACH_I386:
                  predefine("__i386__", 1, "1");
                  predefine("__i386", 1, "1");
!                 predefine("i386", 1, "1");
                  break;
          }
  
!         predefine("__PRAGMA_REDEFINE_EXTNAME", 1, "1");
! 
! #ifdef  __sun
          predefine("__unix__", 1, "1");
          predefine("__unix", 1, "1");
!         predefine("unix", 1, "1");
          predefine("__sun__", 1, "1");
          predefine("__sun", 1, "1");
!         predefine("sun", 1, "1");
          predefine("__svr4__", 1, "1");
  #endif
  }
  
  static void create_builtin_stream(void)
  {
          // Temporary hack
--- 1382,1423 ----
                  }
                  /* fall-through */
          case MACH_SPARC32:
                  predefine("__sparc__", 1, "1");
                  predefine("__sparc", 1, "1");
+                 predefine_nostd("sparc");
                  break;
          case MACH_X86_64:
                  if (arch_m64 != ARCH_LP32) {
                          predefine("__x86_64__", 1, "1");
                          predefine("__x86_64", 1, "1");
+                         predefine("__amd64__", 1, "1");
+                         predefine("__amd64", 1, "1");
                          break;
                  }
                  /* fall-through */
          case MACH_I386:
                  predefine("__i386__", 1, "1");
                  predefine("__i386", 1, "1");
!                 predefine_nostd("i386");
                  break;
          }
  
! #if defined(__unix__)
          predefine("__unix__", 1, "1");
          predefine("__unix", 1, "1");
!         predefine_nostd("unix");
! #endif
! 
! 
! #if defined(__sun__) || defined(__sun)
          predefine("__sun__", 1, "1");
          predefine("__sun", 1, "1");
!         predefine_nostd("sun");
          predefine("__svr4__", 1, "1");
  #endif
+ 
  }
  
  static void create_builtin_stream(void)
  {
          // Temporary hack