update build for newer binutils bfd syntax

.gitignore

@@ -12,6 +12,7 @@ GRTAGS
 .projectile
 
 lefdef/src/lef/lef/lef.tab.h
+lefdef/src/def/def/def.tab.h
 
 man/
 rtf/

anabatic/src/AutoSegment.cpp

@@ -1615,7 +1615,6 @@ namespace Anabatic {
   bool  AutoSegment::isMiddleStack () const
   {
     cdebug_log(149,0) << "AutoSegment::isMiddleStack() - " << this << endl;
-    if (not isCanonical()) return false;
     if (isNonPref()) return false;
     if (isGlobal()) {
       if (getLength() > getPPitch()) return false;
@@ -1761,10 +1760,7 @@ namespace Anabatic {
     cdebug_log(159,0) << "AutoSegment::canReduce():" << this << endl;
     cdebug_log(159,0) << "  _reduceds:" << _reduceds << endl;
 
-    DbU::Unit length = getAnchoredLength();
+    if (isGlobal() or isDrag() or isFixed()) return false;
-    if (isGlobal() and (length > getPPitch())) return false;
-
-    if (isDrag() or isFixed()) return false;
     if (not isSpinTopOrBottom()) return false;
     if ((getDepth() == 1) and isSpinBottom()) return false;
     if ((flags & Flags::WithPerpands) and _reduceds) return false;
@@ -1781,8 +1777,8 @@ namespace Anabatic {
     // if (  source->isHTee() or source->isVTee()
     //    or target->isHTee() or target->isVTee() ) return false;
 
-    cdebug_log(159,0) << "  length:" << DbU::getValueString(length) << endl;
+    cdebug_log(159,0) << "  length:" << DbU::getValueString(getAnchoredLength()) << endl;
-    if (flags & Flags::NullLength) return (length == 0); 
+    if (flags & Flags::NullLength) return (getAnchoredLength() == 0); 
 
     unsigned int perpandicularDepth = getDepth();
     if (isSpinBottom()) {
@@ -2120,10 +2116,6 @@ namespace Anabatic {
     if (Session::getRoutingGauge()->getName() == "FlexLib")
       reserve += 2.0;
 
-  // ls180 hard-coded hack.
-  //if (getId() == 10023986) return false;
-    if (getId() == 6378409) return false;
-
     bool   nLowDensity   = true;
     bool   nLowUpDensity = true;
 

bootstrap/builder/Builder.py

@@ -39,7 +39,7 @@ class Builder:
         self._macports         = False
         self._devtoolset       = 0
         self._llvmtoolset      = 0
-        self._qt5              = False
+        self._qt5              = True
         self._openmp           = False
         self._enableShared     = "ON"
         self._enableDoc        = "OFF"

hurricane/src/hurricane/Backtrace.cpp

@@ -282,7 +282,7 @@ namespace {
 
     obfd->_slurpSymtab();
 
-    if (not (bfd_get_section_flags(obfd->_abfd, obfd->_textSection) & SEC_ALLOC)) { obfd->_clear(); return obfd; }
+    if (not (bfd_section_flags(obfd->_textSection) & SEC_ALLOC)) { obfd->_clear(); return obfd; }
 
     obfd->_scratchSymbol = bfd_make_empty_symbol( obfd->_abfd );
     if (not obfd->_scratchSymbol) { obfd->_clear(); return obfd; }
@@ -323,8 +323,8 @@ namespace {
     if (not _isRelocated and not _computeRelocation(request)) return false;
 
     int64_t       dsoAddress      = request.relocatedAddress() - _relocationOffset;
-    bfd_vma       textSectionVma  = bfd_get_section_vma( _abfd, _textSection );
+    bfd_vma       textSectionVma  = bfd_section_vma ( _textSection );
-    bfd_size_type textSectionSize = bfd_section_size   ( _abfd, _textSection );
+    bfd_size_type textSectionSize = bfd_section_size( _textSection );
     const char*   fileName        = NULL;
     const char*   funcName        = NULL;
 

hurricane/src/hurricane/hurricane/Go.h

@@ -56,7 +56,7 @@ class Go : public Entity {
 // ************
 
     protected: Go();
-    protected: virtual ~Go() throw(Error);
+    protected: virtual ~Go();
 
 // Predicates
 // **********

katana/src/RoutingEvent.cpp

@@ -430,7 +430,7 @@ namespace Katana {
     cdebug_log(9000,0) << "Deter| Event "
                      <<         getProcesseds()
                      << ","  << getEventLevel()
-                     << ","  << tsetw(6) << getPriority()
+                     << ","  << setw(6) << getPriority()
                      << ": " << _segment << endl;
     _processeds++;
 

katana/src/Track.cpp

@@ -124,8 +124,9 @@ namespace {
     uint64_t      id         = element->getNet()->getId();
 
     if (_spans.empty()) {
-      cdebug_log(159,0) << "GapSet::merge() new range " << i
+    //if (id == 317015)
-                        << " " << _track->getSegment(i) << endl;
+    //  cerr << "GapSet::merge() new range " << i
+    //       << " " << _track->getSegment(i) << endl;
       _spans.push_back( make_pair(i,i) );
       return;
     }
@@ -133,28 +134,33 @@ namespace {
     size_t        ispan      = 0;
     DbU::Unit     segSourceU = element->getSourceU()+_halfSpacing;
     DbU::Unit     segTargetU = element->getTargetU()-_halfSpacing;
-    cdebug_log(159,0) << "GapSet::merge() " << element << endl;
+  //if (id == 317015)
+  //  cerr << "GapSet::merge() " << element << endl;
     for ( ; ispan<_spans.size() ; ++ispan ) {
       if (targetU(ispan) >= segSourceU) {
         if (targetU(ispan) >= segTargetU) {
-          cdebug_log(159,0) << "GapSet::merge() already inside range" << endl;
+        //if (id == 317015)
+        //  cerr << "GapSet::merge() already inside range" << endl;
           return;
         }
         _spans[ispan].second = i;
-        cdebug_log(159,0) << "GapSet::merge() becomes range end" << endl;
+      //if (id == 317015)
+      //  cerr << "GapSet::merge() becomes range end" << endl;
         break;
       }
     }
     if (ispan == _spans.size()) {
       _spans.push_back( make_pair(i,i) );
-      cdebug_log(159,0) << "GapSet::merge() new range" << endl;
+    //if (id == 317015)
+    //  cerr << "GapSet::merge() new range" << endl;
       return;
     }
     while ( ispan+1 < _spans.size() ) {
       if (targetU(ispan) >= sourceU(ispan+1)) {
         _spans[ispan].second = std::max( targetU(ispan), targetU(ispan+1) );
         _spans.erase( _spans.begin()+ispan+1 );
-        cdebug_log(159,0) << "GapSet::merge() fuse with next range" << endl;
+      //if (id == 317015)
+      //  cerr << "GapSet::merge() fuse with next range" << endl;
       }
     }
   }
@@ -997,8 +1003,7 @@ namespace Katana {
 
   uint32_t  Track::repair () const
   {
-  //if ((getIndex() == 6428) and isVertical()) DebugSession::open( 150, 160 );
+    // cerr << "Track::repair() " << this << endl;
-    cdebug_log(159,0) << "Track::repair() " << this << endl;
     
     if (_segments.empty()) return 0;
     DbU::Unit minSpacing = getLayer()->getMinimalSpacing();
@@ -1008,7 +1013,8 @@ namespace Katana {
     GapSet   gapsetPrev ( this );
     GapSet   gapsetCurr ( this );
     for ( size_t i=0 ; i<_segments.size()-1 ; i++ ) {
-      cdebug_log(159,0) << "[" << i << "] " << _segments[i] << endl;
+      // if (getIndex() == 1750)
+      //   cerr << "[" << i << "] " << _segments[i] << endl;
       netChange = false;
       gapsetCurr.merge( i );
       if (  (_segments[i]->getNet() != _segments[i+1]->getNet())
@@ -1044,25 +1050,25 @@ namespace Katana {
 
       if (netChange or (i+2 == _segments.size())) {
         if (gapsetCurr.size() > 1) {
-          cdebug_log(159,0) << "potential gap around " << _segments[i] << endl;
+          // cerr << "potential gap around " << _segments[i] << endl;
           for ( size_t j=0 ; j+1 < gapsetCurr.size() ; ++j ) {
-            cdebug_log(159,0) << j << "=[" << DbU::getValueString(gapsetCurr.sourceU(j))
+            // cerr << j << "=[" << DbU::getValueString(gapsetCurr.sourceU(j))
-                              <<       " " << DbU::getValueString(gapsetCurr.targetU(j)) << "], "
+            //      <<       " " << DbU::getValueString(gapsetCurr.targetU(j)) << "], "
-                              << j+1 << "=[" << DbU::getValueString(gapsetCurr.sourceU(j+1))
+            //      << j+1 << "=[" << DbU::getValueString(gapsetCurr.sourceU(j+1))
-                              <<         " " << DbU::getValueString(gapsetCurr.targetU(j+1)) << "]" << endl;
+            //      <<         " " << DbU::getValueString(gapsetCurr.targetU(j+1)) << "]" << endl;
             DbU::Unit spacing = gapsetCurr.sourceU(j+1) - gapsetCurr.targetU(j);
-            cdebug_log(159,0) << "| spacing=" << DbU::getValueString(spacing) << endl;
+            // cerr << "| spacing=" << DbU::getValueString(spacing) << endl;
             if (spacing < minSpacing) {
-              cdebug_log(159,0) << j << "=[" << DbU::getValueString(gapsetCurr.sourceU(j))
+              // cerr << j << "=[" << DbU::getValueString(gapsetCurr.sourceU(j))
-                                <<       " " << DbU::getValueString(gapsetCurr.targetU(j)) << "], "
+              //      <<       " " << DbU::getValueString(gapsetCurr.targetU(j)) << "], "
-                                << j+1 << "=[" << DbU::getValueString(gapsetCurr.sourceU(j+1))
+              //      << j+1 << "=[" << DbU::getValueString(gapsetCurr.sourceU(j+1))
-                                <<         " " << DbU::getValueString(gapsetCurr.targetU(j+1)) << "]" << endl;
+              //      <<         " " << DbU::getValueString(gapsetCurr.targetU(j+1)) << "]" << endl;
               if (gapsetCurr.span(j+1).first >= _segments.size()) {
                 cerr << Error("gapsetCurr.span(j+1).first >= _segments.size()") << endl;
               } else {
                 AutoSegment* first = _segments[gapsetCurr.span(j+1).first]->base();
                 
-                cdebug_log(159,0) << "spacing:" << DbU::getValueString(spacing) << " " << first << endl;
+                // cerr << "spacing:" << DbU::getValueString(spacing) << " " << first << endl;
 	            if (first == NULL) {
 		          cerr << Error("null first, NOT correcting gap") << endl;
 	            } else {
@@ -1070,14 +1076,14 @@ namespace Katana {
                     if (segment->getSourcePosition() < first->getSourcePosition())
                       first = segment;
                   }
-                  cdebug_log(159,0) << "duSource:" << DbU::getValueString(first->getDuSource()) << endl;
+                  // cerr << "duSource:" << DbU::getValueString(first->getDuSource()) << endl;
                   first->setDuSource( first->getDuSource() - spacing - minSpacing/2 );
 	            }
                 ++gaps;
                 cerr << Warning( " Track::repair(): Closing same net gap in %s near:\n  %s"
                                , getString(this).c_str()
                                , getString(_segments[(i) ? i-1 : 0]).c_str() ) << endl;
-                cdebug_log(159,0) << first << endl;
+              // cerr << first << endl;
               }
             }
           }
@@ -1088,7 +1094,6 @@ namespace Katana {
       }
     }
 
-  //if ((getIndex() == 6428) and isVertical()) DebugSession::close();
     return gaps;
   }
 

lefdef/src/def/def/def.tab.h

@@ -1,320 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-#ifndef YY_DEFYY_DEF_TAB_HPP_INCLUDED
-# define YY_DEFYY_DEF_TAB_HPP_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int defyydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    QSTRING = 258,
-    T_STRING = 259,
-    SITE_PATTERN = 260,
-    NUMBER = 261,
-    K_HISTORY = 262,
-    K_NAMESCASESENSITIVE = 263,
-    K_DESIGN = 264,
-    K_VIAS = 265,
-    K_TECH = 266,
-    K_UNITS = 267,
-    K_ARRAY = 268,
-    K_FLOORPLAN = 269,
-    K_SITE = 270,
-    K_CANPLACE = 271,
-    K_CANNOTOCCUPY = 272,
-    K_DIEAREA = 273,
-    K_PINS = 274,
-    K_DEFAULTCAP = 275,
-    K_MINPINS = 276,
-    K_WIRECAP = 277,
-    K_TRACKS = 278,
-    K_GCELLGRID = 279,
-    K_DO = 280,
-    K_BY = 281,
-    K_STEP = 282,
-    K_LAYER = 283,
-    K_ROW = 284,
-    K_RECT = 285,
-    K_COMPS = 286,
-    K_COMP_GEN = 287,
-    K_SOURCE = 288,
-    K_WEIGHT = 289,
-    K_EEQMASTER = 290,
-    K_FIXED = 291,
-    K_COVER = 292,
-    K_UNPLACED = 293,
-    K_PLACED = 294,
-    K_FOREIGN = 295,
-    K_REGION = 296,
-    K_REGIONS = 297,
-    K_NETS = 298,
-    K_START_NET = 299,
-    K_MUSTJOIN = 300,
-    K_ORIGINAL = 301,
-    K_USE = 302,
-    K_STYLE = 303,
-    K_PATTERN = 304,
-    K_PATTERNNAME = 305,
-    K_ESTCAP = 306,
-    K_ROUTED = 307,
-    K_NEW = 308,
-    K_SNETS = 309,
-    K_SHAPE = 310,
-    K_WIDTH = 311,
-    K_VOLTAGE = 312,
-    K_SPACING = 313,
-    K_NONDEFAULTRULE = 314,
-    K_NONDEFAULTRULES = 315,
-    K_N = 316,
-    K_S = 317,
-    K_E = 318,
-    K_W = 319,
-    K_FN = 320,
-    K_FE = 321,
-    K_FS = 322,
-    K_FW = 323,
-    K_GROUPS = 324,
-    K_GROUP = 325,
-    K_SOFT = 326,
-    K_MAXX = 327,
-    K_MAXY = 328,
-    K_MAXHALFPERIMETER = 329,
-    K_CONSTRAINTS = 330,
-    K_NET = 331,
-    K_PATH = 332,
-    K_SUM = 333,
-    K_DIFF = 334,
-    K_SCANCHAINS = 335,
-    K_START = 336,
-    K_FLOATING = 337,
-    K_ORDERED = 338,
-    K_STOP = 339,
-    K_IN = 340,
-    K_OUT = 341,
-    K_RISEMIN = 342,
-    K_RISEMAX = 343,
-    K_FALLMIN = 344,
-    K_FALLMAX = 345,
-    K_WIREDLOGIC = 346,
-    K_MAXDIST = 347,
-    K_ASSERTIONS = 348,
-    K_DISTANCE = 349,
-    K_MICRONS = 350,
-    K_END = 351,
-    K_IOTIMINGS = 352,
-    K_RISE = 353,
-    K_FALL = 354,
-    K_VARIABLE = 355,
-    K_SLEWRATE = 356,
-    K_CAPACITANCE = 357,
-    K_DRIVECELL = 358,
-    K_FROMPIN = 359,
-    K_TOPIN = 360,
-    K_PARALLEL = 361,
-    K_TIMINGDISABLES = 362,
-    K_THRUPIN = 363,
-    K_MACRO = 364,
-    K_PARTITIONS = 365,
-    K_TURNOFF = 366,
-    K_FROMCLOCKPIN = 367,
-    K_FROMCOMPPIN = 368,
-    K_FROMIOPIN = 369,
-    K_TOCLOCKPIN = 370,
-    K_TOCOMPPIN = 371,
-    K_TOIOPIN = 372,
-    K_SETUPRISE = 373,
-    K_SETUPFALL = 374,
-    K_HOLDRISE = 375,
-    K_HOLDFALL = 376,
-    K_VPIN = 377,
-    K_SUBNET = 378,
-    K_XTALK = 379,
-    K_PIN = 380,
-    K_SYNTHESIZED = 381,
-    K_DEFINE = 382,
-    K_DEFINES = 383,
-    K_DEFINEB = 384,
-    K_IF = 385,
-    K_THEN = 386,
-    K_ELSE = 387,
-    K_FALSE = 388,
-    K_TRUE = 389,
-    K_EQ = 390,
-    K_NE = 391,
-    K_LE = 392,
-    K_LT = 393,
-    K_GE = 394,
-    K_GT = 395,
-    K_OR = 396,
-    K_AND = 397,
-    K_NOT = 398,
-    K_SPECIAL = 399,
-    K_DIRECTION = 400,
-    K_RANGE = 401,
-    K_FPC = 402,
-    K_HORIZONTAL = 403,
-    K_VERTICAL = 404,
-    K_ALIGN = 405,
-    K_MIN = 406,
-    K_MAX = 407,
-    K_EQUAL = 408,
-    K_BOTTOMLEFT = 409,
-    K_TOPRIGHT = 410,
-    K_ROWS = 411,
-    K_TAPER = 412,
-    K_TAPERRULE = 413,
-    K_VERSION = 414,
-    K_DIVIDERCHAR = 415,
-    K_BUSBITCHARS = 416,
-    K_PROPERTYDEFINITIONS = 417,
-    K_STRING = 418,
-    K_REAL = 419,
-    K_INTEGER = 420,
-    K_PROPERTY = 421,
-    K_BEGINEXT = 422,
-    K_ENDEXT = 423,
-    K_NAMEMAPSTRING = 424,
-    K_ON = 425,
-    K_OFF = 426,
-    K_X = 427,
-    K_Y = 428,
-    K_COMPONENT = 429,
-    K_MASK = 430,
-    K_MASKSHIFT = 431,
-    K_COMPSMASKSHIFT = 432,
-    K_SAMEMASK = 433,
-    K_PINPROPERTIES = 434,
-    K_TEST = 435,
-    K_COMMONSCANPINS = 436,
-    K_SNET = 437,
-    K_COMPONENTPIN = 438,
-    K_REENTRANTPATHS = 439,
-    K_SHIELD = 440,
-    K_SHIELDNET = 441,
-    K_NOSHIELD = 442,
-    K_VIRTUAL = 443,
-    K_ANTENNAPINPARTIALMETALAREA = 444,
-    K_ANTENNAPINPARTIALMETALSIDEAREA = 445,
-    K_ANTENNAPINGATEAREA = 446,
-    K_ANTENNAPINDIFFAREA = 447,
-    K_ANTENNAPINMAXAREACAR = 448,
-    K_ANTENNAPINMAXSIDEAREACAR = 449,
-    K_ANTENNAPINPARTIALCUTAREA = 450,
-    K_ANTENNAPINMAXCUTCAR = 451,
-    K_SIGNAL = 452,
-    K_POWER = 453,
-    K_GROUND = 454,
-    K_CLOCK = 455,
-    K_TIEOFF = 456,
-    K_ANALOG = 457,
-    K_SCAN = 458,
-    K_RESET = 459,
-    K_RING = 460,
-    K_STRIPE = 461,
-    K_FOLLOWPIN = 462,
-    K_IOWIRE = 463,
-    K_COREWIRE = 464,
-    K_BLOCKWIRE = 465,
-    K_FILLWIRE = 466,
-    K_BLOCKAGEWIRE = 467,
-    K_PADRING = 468,
-    K_BLOCKRING = 469,
-    K_BLOCKAGES = 470,
-    K_PLACEMENT = 471,
-    K_SLOTS = 472,
-    K_FILLS = 473,
-    K_PUSHDOWN = 474,
-    K_NETLIST = 475,
-    K_DIST = 476,
-    K_USER = 477,
-    K_TIMING = 478,
-    K_BALANCED = 479,
-    K_STEINER = 480,
-    K_TRUNK = 481,
-    K_FIXEDBUMP = 482,
-    K_FENCE = 483,
-    K_FREQUENCY = 484,
-    K_GUIDE = 485,
-    K_MAXBITS = 486,
-    K_PARTITION = 487,
-    K_TYPE = 488,
-    K_ANTENNAMODEL = 489,
-    K_DRCFILL = 490,
-    K_OXIDE1 = 491,
-    K_OXIDE2 = 492,
-    K_OXIDE3 = 493,
-    K_OXIDE4 = 494,
-    K_CUTSIZE = 495,
-    K_CUTSPACING = 496,
-    K_DESIGNRULEWIDTH = 497,
-    K_DIAGWIDTH = 498,
-    K_ENCLOSURE = 499,
-    K_HALO = 500,
-    K_GROUNDSENSITIVITY = 501,
-    K_HARDSPACING = 502,
-    K_LAYERS = 503,
-    K_MINCUTS = 504,
-    K_NETEXPR = 505,
-    K_OFFSET = 506,
-    K_ORIGIN = 507,
-    K_ROWCOL = 508,
-    K_STYLES = 509,
-    K_POLYGON = 510,
-    K_PORT = 511,
-    K_SUPPLYSENSITIVITY = 512,
-    K_VIA = 513,
-    K_VIARULE = 514,
-    K_WIREEXT = 515,
-    K_EXCEPTPGNET = 516,
-    K_FILLWIREOPC = 517,
-    K_OPC = 518,
-    K_PARTIAL = 519,
-    K_ROUTEHALO = 520
-  };
-#endif
-
-/* Value type.  */
-
-
-
-int defyyparse (defrData *defData);
-
-#endif /* !YY_DEFYY_DEF_TAB_HPP_INCLUDED  */