luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into magic-8.2

This commit is contained in:
Tim Edwards 2019-07-03 03:00:04 -04:00
parent 7395f965a2 95ca3d93cc
commit ff8fcbd8cd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -9,4 +9,4 @@
# script itself. It also sets up CFLAGS without the default optimizer # script itself. It also sets up CFLAGS without the default optimizer
# flag (-O2). # flag (-O2).
( CFLAGS="-g"; export CFLAGS; cd scripts ; ./configure $* ) ( CFLAGS="-g"; export CFLAGS; cd scripts ; ./configure "$@" )

10
lef/defRead.c
View File

@ -431,8 +431,8 @@ endCoord:
enum def_net_keys {DEF_NET_START = 0, DEF_NET_END}; enum def_net_keys {DEF_NET_START = 0, DEF_NET_END};
enum def_netprop_keys { enum def_netprop_keys {
DEF_NETPROP_USE = 0, DEF_NETPROP_ROUTED, DEF_NETPROP_FIXED, DEF_NETPROP_USE = 0, DEF_NETPROP_ROUTED, DEF_NETPROP_FIXED,
DEF_NETPROP_COVER, DEF_NETPROP_SOURCE, DEF_NETPROP_WEIGHT, DEF_NETPROP_COVER, DEF_NETPROP_SOURCE, DEF_NETPROP_SHAPE,
DEF_NETPROP_PROPERTY}; DEF_NETPROP_WEIGHT, DEF_NETPROP_PROPERTY};
void void
DefReadNets(f, rootDef, sname, oscale, special, total) DefReadNets(f, rootDef, sname, oscale, special, total)
@ -460,6 +460,7 @@ DefReadNets(f, rootDef, sname, oscale, special, total)
"FIXED", "FIXED",
"COVER", "COVER",
"SOURCE", "SOURCE",
"SHAPE",
"WEIGHT", "WEIGHT",
"PROPERTY", "PROPERTY",
NULL NULL
@ -516,7 +517,10 @@ DefReadNets(f, rootDef, sname, oscale, special, total)
switch (subkey) switch (subkey)
{ {
case DEF_NETPROP_USE: case DEF_NETPROP_USE:
/* Presently, we ignore this */ case DEF_NETPROP_SHAPE:
/* Presently, we ignore this, except to */
/* absorb the following value. */
token = LefNextToken(f, TRUE);
break; break;
case DEF_NETPROP_ROUTED: case DEF_NETPROP_ROUTED:
case DEF_NETPROP_FIXED: case DEF_NETPROP_FIXED: