12166 resync smatch to 0.6.1-rc1-il-3

          --- old/usr/src/tools/smatch/Makefile
          +++ new/usr/src/tools/smatch/Makefile
   1    1  #
   2    2  # This file and its contents are supplied under the terms of the
   3    3  # Common Development and Distribution License ("CDDL"), version 1.0.
   4    4  # You may only use this file in accordance with the terms of version
   5    5  # 1.0 of the CDDL.
   6    6  #
   7    7  # A full copy of the text of the CDDL should have accompanied this
   8    8  # source.  A copy of the CDDL is also available via the Internet at
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11      -# Copyright 2019 Joyent, Inc.
       11 +# Copyright 2020 Joyent, Inc.
  12   12  #
  13   13  
  14   14  #
  15   15  # The src/ sub-directory is un-modified copy of
  16   16  # https://github.com/illumos/smatch/tree/$SPARSE_VERSION
  17   17  #
  18   18  # This Makefile installs just enough for us to be able to run smatch
  19   19  # locally.
  20   20  #
  21   21  
  22   22  PROG = smatch
  23      -SPARSE_VERSION = 0.6.1-rc1-il-2
       23 +SPARSE_VERSION = 0.6.1-rc1-il-3
  24   24  
  25   25  include ../Makefile.tools
  26   26  
  27   27  # We have to build smatch before we can use cw
  28   28  i386_CC = $(GNUC_ROOT)/bin/gcc
  29   29  sparc_CC = $(GNUC_ROOT)/bin/gcc
  30   30  # sparc doesn't recognise -msave-args
  31   31  i386_SMATCHFLAGS = -msave-args
  32   32  sparc_SMATCHFLAGS =
  33   33  
  34      -CFLAGS = -O -m64 $($(MACH)_SMATCHFLAGS) -D__sun -Wall -Wno-unknown-pragmas -std=gnu99 -nodefaultlibs
       34 +CFLAGS = -O -m64 -std=gnu99 -nodefaultlibs -D__sun $($(MACH)_SMATCHFLAGS)
       35 +CFLAGS += -Wall -Wno-unknown-pragmas -Wno-psabi
  35   36  
  36   37  SMATCHDATADIR = $(ROOTONBLDSHARE)/smatch
  37   38  
  38   39  CFLAGS += -DSMATCHDATADIR='"$(SMATCHDATADIR)"'
  39   40  CFLAGS += -DGCC_BASE='"/no/such/dir"'
  40   41  CFLAGS += -DMULTIARCH_TRIPLET=NULL
  41   42  
  42   43  LDLIBS += -lsqlite3 -lcrypto -lm -lgcc -lc
  43   44  LDFLAGS = $(MAPFILE.NES:%=-Wl,-M%)
  44   45  LDFLAGS += -L$(NATIVE_ADJUNCT)/lib -R$(NATIVE_ADJUNCT)/lib

  45   46  
  46   47  CPPFLAGS += -nostdinc
  47   48  CPPFLAGS += -Isrc/
  48   49  CPPFLAGS += -I$(NATIVE_ADJUNCT)/include
  49   50  
  50   51  # no install.bin
  51   52  INS.file = $(RM) $@; $(CP) $< $(@D); $(CHMOD) $(FILEMODE) $@
  52   53  INS.dir = mkdir -p $@; $(CHMOD) $(DIRMODE) $@
  53   54  
  54   55  # fine for us
  55   56  OS=linux
  56   57  
  57   58  LIB_OBJS =
  58   59  LIB_OBJS += allocate.o
  59   60  LIB_OBJS += builtin.o
  60   61  LIB_OBJS += char.o
  61   62  LIB_OBJS += compat-$(OS).o
  62   63  LIB_OBJS += cse.o
  63   64  LIB_OBJS += dissect.o
  64   65  LIB_OBJS += dominate.o
  65   66  LIB_OBJS += evaluate.o
  66   67  LIB_OBJS += expand.o
  67   68  LIB_OBJS += expression.o
  68   69  LIB_OBJS += flow.o
  69   70  LIB_OBJS += flowgraph.o
  70   71  LIB_OBJS += inline.o
  71   72  LIB_OBJS += ir.o
  72   73  LIB_OBJS += lib.o
  73   74  LIB_OBJS += linearize.o
  74   75  LIB_OBJS += liveness.o
  75   76  LIB_OBJS += memops.o
  76   77  LIB_OBJS += opcode.o
  77   78  LIB_OBJS += optimize.o
  78   79  LIB_OBJS += parse.o
  79   80  LIB_OBJS += pre-process.o
  80   81  LIB_OBJS += ptrlist.o
  81   82  LIB_OBJS += ptrmap.o
  82   83  LIB_OBJS += scope.o
  83   84  LIB_OBJS += show-parse.o
  84   85  LIB_OBJS += simplify.o
  85   86  LIB_OBJS += sort.o
  86   87  LIB_OBJS += ssa.o
  87   88  LIB_OBJS += sset.o
  88   89  LIB_OBJS += stats.o
  89   90  LIB_OBJS += storage.o
  90   91  LIB_OBJS += symbol.o
  91   92  LIB_OBJS += target.o
  92   93  LIB_OBJS += tokenize.o
  93   94  LIB_OBJS += unssa.o
  94   95  LIB_OBJS += utils.o
  95   96  LIB_OBJS += macro_table.o
  96   97  LIB_OBJS += token_store.o
  97   98  LIB_OBJS += hashtable.o
  98   99  
  99  100  SMATCH_OBJS =
 100  101  SMATCH_OBJS += avl.o
 101  102  SMATCH_OBJS += smatch_about_fn_ptr_arg.o
 102  103  SMATCH_OBJS += smatch_address.o
 103  104  SMATCH_OBJS += smatch_annotate.o
 104  105  SMATCH_OBJS += smatch_array_values.o
 105  106  SMATCH_OBJS += smatch_assigned_expr.o
 106  107  SMATCH_OBJS += smatch_bits.o
 107  108  SMATCH_OBJS += smatch_buf_comparison.o
 108  109  SMATCH_OBJS += smatch_buf_size.o
 109  110  SMATCH_OBJS += smatch_capped.o
 110  111  SMATCH_OBJS += smatch_common_functions.o
 111  112  SMATCH_OBJS += smatch_comparison.o
 112  113  SMATCH_OBJS += smatch_conditions.o
 113  114  SMATCH_OBJS += smatch_constraints.o
 114  115  SMATCH_OBJS += smatch_constraints_required.o
 115  116  SMATCH_OBJS += smatch_container_of.o
 116  117  SMATCH_OBJS += smatch_data_source.o
 117  118  SMATCH_OBJS += smatch_db.o
 118  119  SMATCH_OBJS += smatch_equiv.o
 119  120  SMATCH_OBJS += smatch_estate.o
 120  121  SMATCH_OBJS += smatch_expressions.o
 121  122  SMATCH_OBJS += smatch_expression_stacks.o
 122  123  SMATCH_OBJS += smatch_extra.o
 123  124  SMATCH_OBJS += smatch_files.o
 124  125  SMATCH_OBJS += smatch_flow.o
 125  126  SMATCH_OBJS += smatch_fn_arg_link.o
 126  127  SMATCH_OBJS += smatch_function_hooks.o
 127  128  SMATCH_OBJS += smatch_function_info.o
 128  129  SMATCH_OBJS += smatch_function_ptrs.o
 129  130  SMATCH_OBJS += smatch_helper.o
 130  131  SMATCH_OBJS += smatch_hooks.o
 131  132  SMATCH_OBJS += smatch_ignore.o
 132  133  SMATCH_OBJS += smatch_imaginary_absolute.o
 133  134  SMATCH_OBJS += smatch_implied.o
 134  135  SMATCH_OBJS += smatch_impossible.o
 135  136  SMATCH_OBJS += smatch_integer_overflow.o
 136  137  SMATCH_OBJS += smatch_kernel_user_data.o
 137  138  SMATCH_OBJS += smatch_links.o
 138  139  SMATCH_OBJS += smatch_math.o
 139  140  SMATCH_OBJS += smatch_mem_tracker.o
 140  141  SMATCH_OBJS += smatch_modification_hooks.o
 141  142  SMATCH_OBJS += smatch_mtag_data.o
 142  143  SMATCH_OBJS += smatch_mtag_map.o
 143  144  SMATCH_OBJS += smatch_mtag.o
 144  145  SMATCH_OBJS += smatch_nul_terminator.o
 145  146  SMATCH_OBJS += smatch_param_cleared.o
 146  147  SMATCH_OBJS += smatch_param_compare_limit.o
 147  148  SMATCH_OBJS += smatch_parameter_names.o
 148  149  SMATCH_OBJS += smatch_param_filter.o
 149  150  SMATCH_OBJS += smatch_param_limit.o
 150  151  SMATCH_OBJS += smatch_param_set.o
 151  152  SMATCH_OBJS += smatch_param_to_mtag_data.o
 152  153  SMATCH_OBJS += smatch_param_used.o
 153  154  SMATCH_OBJS += smatch_parse_call_math.o
 154  155  SMATCH_OBJS += smatch_passes_array_size.o
 155  156  SMATCH_OBJS += smatch_project.o
 156  157  SMATCH_OBJS += smatch_ranges.o
 157  158  SMATCH_OBJS += smatch_real_absolute.o
 158  159  SMATCH_OBJS += smatch_recurse.o
 159  160  SMATCH_OBJS += smatch_returns.o
 160  161  SMATCH_OBJS += smatch_return_to_param.o
 161  162  SMATCH_OBJS += smatch_scope.o
 162  163  SMATCH_OBJS += smatch_slist.o
 163  164  SMATCH_OBJS += smatch_start_states.o
 164  165  SMATCH_OBJS += smatch_statement_count.o
 165  166  SMATCH_OBJS += smatch_states.o
 166  167  SMATCH_OBJS += smatch_stored_conditions.o
 167  168  SMATCH_OBJS += smatch_string_list.o
 168  169  SMATCH_OBJS += smatch_strings.o

 169  170  SMATCH_OBJS += smatch_strlen.o
 170  171  SMATCH_OBJS += smatch_struct_assignment.o
 171  172  SMATCH_OBJS += smatch_sval.o
 172  173  SMATCH_OBJS += smatch_tracker.o
 173  174  SMATCH_OBJS += smatch_type_links.o
 174  175  SMATCH_OBJS += smatch_type.o
 175  176  SMATCH_OBJS += smatch_type_val.o
 176  177  SMATCH_OBJS += smatch_unknown_value.o
 177  178  SMATCH_OBJS += smatch_untracked_param.o
 178  179  SMATCH_OBJS += smatch_var_sym.o
      180 +SMATCH_OBJS += smatch_parsed_conditions.o
 179  181  
 180  182  SMATCH_CHECK_OBJS:sh=ls src/check_*.c | sed -e 's+\.c+.o+;s+src/++;'
 181  183  
 182  184  OBJS = smatch.o $(LIB_OBJS) $(SMATCH_OBJS) $(SMATCH_CHECK_OBJS)
 183  185  
 184  186  SMATCH_DATA = \
 185  187          illumos_kernel.skipped_functions \
 186  188          illumos_user.skipped_functions
 187  189  
 188  190  SMATCH_DB_DATA =

 189  191  SMATCH_DB_DATA += call_implies.schema
 190  192  SMATCH_DB_DATA += function_ptr.schema
 191  193  SMATCH_DB_DATA += mtag_map.schema
 192  194  SMATCH_DB_DATA += caller_info.schema
 193  195  SMATCH_DB_DATA += function_type.schema
 194  196  SMATCH_DB_DATA += param_map.schema
 195  197  SMATCH_DB_DATA += common_caller_info.schema
 196  198  SMATCH_DB_DATA += function_type_info.schema
 197  199  SMATCH_DB_DATA += parameter_name.schema
 198  200  SMATCH_DB_DATA += constraints.schema
 199  201  SMATCH_DB_DATA += function_type_size.schema
 200  202  SMATCH_DB_DATA += return_implies.schema
 201  203  SMATCH_DB_DATA += constraints_required.schema
 202  204  SMATCH_DB_DATA += function_type_value.schema
 203  205  SMATCH_DB_DATA += return_states.schema
 204  206  SMATCH_DB_DATA += data_info.schema
 205  207  SMATCH_DB_DATA += local_values.schema
 206  208  SMATCH_DB_DATA += sink_info.schema
 207  209  SMATCH_DB_DATA += db.schema
 208  210  SMATCH_DB_DATA += mtag_about.schema
 209  211  SMATCH_DB_DATA += type_info.schema
 210  212  SMATCH_DB_DATA += fn_data_link.schema
 211  213  SMATCH_DB_DATA += mtag_alias.schema
 212  214  SMATCH_DB_DATA += type_size.schema
 213  215  SMATCH_DB_DATA += fn_ptr_data_link.schema
 214  216  SMATCH_DB_DATA += mtag_data.schema
 215  217  SMATCH_DB_DATA += type_value.schema
 216  218  
 217  219  ROOTONBLDDATAFILES = $(SMATCH_DATA:%=$(SMATCHDATADIR)/smatch_data/%)
 218  220  ROOTONBLDDATAFILES += $(SMATCH_DB_DATA:%=$(SMATCHDATADIR)/smatch_data/db/%)
 219  221  
 220  222  BUILT_HEADERS = src/version.h src/check_list_local.h
 221  223  
 222  224  .KEEP_STATE:
 223  225  
 224  226  .PARALLEL: $(OBJS)
 225  227  
 226  228  all: $(PROG)
 227  229  
 228  230  install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDDATAFILES)
 229  231  
 230  232  clean:
 231  233          rm -f $(OBJS) $(BUILT_HEADERS)
 232  234  
 233  235  $(ROOTONBLDDATAFILES): $(SMATCHDATADIR)/smatch_data/db
 234  236  
 235  237  $(SMATCHDATADIR)/smatch_data/%: src/smatch_data/%
 236  238          $(INS.file)
 237  239  
 238  240  $(SMATCHDATADIR)/smatch_data/db:
 239  241          $(INS.dir)
 240  242  
 241  243  $(SMATCHDATADIR)/smatch_data:
 242  244          $(INS.dir)
 243  245  
 244  246  $(PROG): $(OBJS)
 245  247          $(LINK.c) $(OBJS) -o $@ $(LDLIBS)
 246  248          $(POST_PROCESS)
 247  249  
 248  250  %.o: src/%.c $(BUILT_HEADERS)
 249  251          $(COMPILE.c) -o $@ $<
 250  252  
 251  253  %.o: src/cwchash/%.c
 252  254          $(COMPILE.c) -o $@ $<
 253  255  
 254  256  src/check_list_local.h:
 255  257          touch src/check_list_local.h
 256  258  
 257  259  src/version.h:
 258  260          echo '#define SPARSE_VERSION "$(SPARSE_VERSION)"' > src/version.h
 259  261  
 260  262  include ../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX