12166 resync smatch to 0.6.1-rc1-il-3

@@ -1,6 +1,6 @@
-VERSION=0.6.1-rc1-il-2
+VERSION=0.6.1-rc1-il-3
 
 ########################################################################
 # The following variables can be overwritten from the command line
 OS = linux
 

@@ -93,11 +93,11 @@
 
 ########################################################################
 # common flags/options/...
 
 cflags = -fno-strict-aliasing
-cflags += -Wall -Wwrite-strings -Wno-switch
+cflags += -Wall -Wwrite-strings -Wno-switch -Wno-psabi
 
 GCC_BASE := $(shell $(CC) --print-file-name=)
 cflags += -DGCC_BASE=\"$(GCC_BASE)\"
 
 MULTIARCH_TRIPLET := $(shell $(CC) -print-multiarch 2>/dev/null)

@@ -252,10 +252,11 @@
 SMATCH_OBJS += smatch_param_limit.o
 SMATCH_OBJS += smatch_param_set.o
 SMATCH_OBJS += smatch_param_to_mtag_data.o
 SMATCH_OBJS += smatch_param_used.o
 SMATCH_OBJS += smatch_parse_call_math.o
+SMATCH_OBJS += smatch_parsed_conditions.o
 SMATCH_OBJS += smatch_passes_array_size.o
 SMATCH_OBJS += smatch_project.o
 SMATCH_OBJS += smatch_ranges.o
 SMATCH_OBJS += smatch_real_absolute.o
 SMATCH_OBJS += smatch_recurse.o