manual/CHAPTER_StateOfTheArt/sis-1.3.6-buildfixes.patch

   1 Some minor build fixes for sis-1.3.6 as it can be downloaded from
   2 http://www-cad.eecs.berkeley.edu/~pchong/sis.html or
   3 http://embedded.eecs.berkeley.edu/Alumni/pchong/sis.html
   4
   5 diff --git a/sis/io/read_kiss.c b/sis/io/read_kiss.c
   6 index 814e526..c862892 100644
   7 --- a/sis/io/read_kiss.c
   8 +++ b/sis/io/read_kiss.c
   9 @@ -10,7 +10,6 @@
  10  #ifdef SIS
  11  #include "sis.h"
  12
  13 -extern void read_error();
  14  extern int read_lineno;
  15  extern char *read_filename;
  16
  17 diff --git a/sis/pld/act_bdd.c b/sis/pld/act_bdd.c
  18 index 4fb4415..a5cd74c 100644
  19 --- a/sis/pld/act_bdd.c
  20 +++ b/sis/pld/act_bdd.c
  21 @@ -141,6 +141,8 @@ char *name;
  22      return p_vertex;
  23  }
  24
  25 +static int compare();
  26 +
  27  /* Or 2 ACT's*/
  28  act_t *
  29  my_or_act_F(array_b,cover, array)
  30 @@ -148,7 +150,6 @@ array_t *array_b;
  31  array_t *array;
  32  sm_row *cover;
  33  {
  34 -    static int compare();
  35      int  i;
  36      act_t *up_vertex, *down_vertex, *vertex;
  37      sm_element *p;
  38 diff --git a/sis/pld/act_ite.c b/sis/pld/act_ite.c
  39 index a35f2fb..7b824df 100644
  40 --- a/sis/pld/act_ite.c
  41 +++ b/sis/pld/act_ite.c
  42 @@ -125,6 +125,8 @@ node_t *fanin;
  43     and the minimum column cover variables in cover, generates an ite for the
  44     original function. */
  45
  46 +static int compare();
  47 +
  48  ite_vertex *
  49  my_or_ite_F(array_b, cover, array, network)
  50  array_t *array_b;
  51 @@ -132,7 +134,6 @@ array_t *array;
  52  sm_row *cover;
  53  network_t *network;
  54  {
  55 -    static int compare();
  56      int  i;
  57      ite_vertex *vertex;
  58      sm_element *p;
  59 diff --git a/sis/pld/xln_merge.c b/sis/pld/xln_merge.c
  60 index 075e6c5..16f4d61 100644
  61 --- a/sis/pld/xln_merge.c
  62 +++ b/sis/pld/xln_merge.c
  63 @@ -284,6 +284,7 @@ array_t             *match1_array, *match2_array;
  64
  65  }
  66
  67 +static sm_row *xln_merge_find_neighbor_of_row1_with_minimum_neighbors();
  68  \f
  69  /*----------------------------------------------------------------------------------------------------
  70    An alternate to lindo option. Uses greedy merging. A node with minimum mergeable nodes is picked
  71 @@ -296,7 +297,6 @@ xln_merge_nodes_without_lindo(coeff, cand_node_array, match1_array, match2_array
  72  {
  73    node_t *n1, *n2;
  74    sm_row *row1, *row2;
  75 -  static sm_row *xln_merge_find_neighbor_of_row1_with_minimum_neighbors();
  76
  77    while (TRUE) {
  78        row1 = sm_shortest_row(coeff);
  79 diff --git a/sis/pld/xln_part_dec.c b/sis/pld/xln_part_dec.c
  80 index 1c856bd..b78828a 100644
  81 --- a/sis/pld/xln_part_dec.c
  82 +++ b/sis/pld/xln_part_dec.c
  83 @@ -49,13 +49,14 @@ int size;
  84
  85  \f
  86
  87 +static int kernel_value();
  88 +
  89  int
  90  split_node(network, node, size)
  91  network_t *network;
  92  node_t *node;
  93  int size;
  94  {
  95 -    static int kernel_value();
  96      int i, value = 1;
  97      kern_node *sorted;
  98      divisor_t *div, *best_div;
  99 diff --git a/xsis/Makefile.am b/xsis/Makefile.am
 100 index 196d98b..686fdf4 100644
 101 --- a/xsis/Makefile.am
 102 +++ b/xsis/Makefile.am
 103 @@ -1,8 +1,8 @@
 104  xsis_SOURCES_local = NetPlot.c NetPlot.h NetPlotP.h main.c xastg.c \
 105      xblif.c xcmd.c xhelp.c xsis.c xsis.h xutil.c \
 106      blif50.px ghost.px help50.px sis50.px
 107 -AM_CPPFLAGS = -I../sis/include -I@SIS_X_INCLUDES@
 108 -AM_LDFLAGS = -L@SIS_X_LIBRARIES@
 109 +AM_CPPFLAGS = -I../sis/include
 110 +AM_LDFLAGS =
 111  LDADD = ../sis/libsis.a -lXaw -lXmu -lXt -lXext -lX11 -lm
 112
 113  if SIS_COND_X