Merge branch 'work' into tomerge

cif/CIFrdtech.c

@@ -1107,6 +1107,9 @@ CIFReadGetGrowSize(type)
 
     for (i = 0; i < istyle->crs_nLayers; i++)
     {
+	/* Don't confuse CIF types with magic types! */
+	if (istyle->crs_layers[i]->crl_flags & CIFR_TEMPLAYER) continue;
+
 	if (istyle->crs_layers[i]->crl_magicType == type)
 	{
 	    dist = 0;

lef/lefRead.c

@@ -1168,7 +1168,8 @@ LefReadPort(lefMacro, f, pinName, pinNum, pinDir, pinUse, oscale)
 
 enum lef_pin_keys {LEF_DIRECTION = 0, LEF_USE, LEF_PORT, LEF_CAPACITANCE,
 	LEF_ANTENNADIFF, LEF_ANTENNAGATE, LEF_ANTENNAMOD,
-	LEF_ANTENNAPAR, LEF_ANTENNAPARSIDE, LEF_ANTENNAMAX, LEF_ANTENNAMAXSIDE,
+	LEF_ANTENNAPAR, LEF_ANTENNAPARSIDE, LEF_ANTENNAPARCUT,
+	LEF_ANTENNAMAX, LEF_ANTENNAMAXSIDE,
 	LEF_SHAPE, LEF_NETEXPR, LEF_PIN_END};
 
 void
@@ -1194,6 +1195,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale)
 	"ANTENNAMODEL",
 	"ANTENNAPARTIALMETALAREA",
 	"ANTENNAPARTIALMETALSIDEAREA",
+	"ANTENNAPARTIALCUTAREA",
 	"ANTENNAMAXAREACAR",
 	"ANTENNAMAXSIDEAREACAR",
 	"SHAPE",
@@ -1278,6 +1280,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale)
 	    case LEF_ANTENNAMOD:
 	    case LEF_ANTENNAPAR:
 	    case LEF_ANTENNAPARSIDE:
+	    case LEF_ANTENNAPARCUT:
 	    case LEF_ANTENNAMAX:
 	    case LEF_ANTENNAMAXSIDE:
 	    case LEF_SHAPE:
@@ -1746,7 +1749,7 @@ enum lef_layer_keys {LEF_LAYER_TYPE=0, LEF_LAYER_WIDTH,
 	LEF_LAYER_RES, LEF_LAYER_CAP, LEF_LAYER_EDGECAP,
 	LEF_LAYER_THICKNESS, LEF_LAYER_HEIGHT,
 	LEF_LAYER_MINDENSITY, LEF_LAYER_ANTENNADIFF,
-	LEF_LAYER_ANTENNASIDE,
+	LEF_LAYER_ANTENNAAREA, LEF_LAYER_ANTENNASIDE,
 	LEF_VIA_DEFAULT, LEF_VIA_LAYER, LEF_VIA_RECT,
 	LEF_VIA_ENCLOSURE, LEF_VIA_PREFERENCLOSURE,
 	LEF_VIARULE_OVERHANG,
@@ -1792,6 +1795,7 @@ LefReadLayerSection(f, lname, mode, lefl)
 	"THICKNESS",
 	"HEIGHT",
 	"MINIMUMDENSITY",
+	"ANTENNAAREARATIO",
 	"ANTENNADIFFAREARATIO",
 	"ANTENNASIDEAREARATIO",
 	"DEFAULT",
@@ -1893,6 +1897,7 @@ LefReadLayerSection(f, lname, mode, lefl)
 	    case LEF_LAYER_THICKNESS:
 	    case LEF_LAYER_HEIGHT:
 	    case LEF_LAYER_MINDENSITY:
+	    case LEF_LAYER_ANTENNAAREA:
 	    case LEF_LAYER_ANTENNADIFF:
 	    case LEF_LAYER_ANTENNASIDE:
 	    case LEF_LAYER_WIREEXT:

scripts/configure

@@ -7779,6 +7779,9 @@ case $target in
     if test "$CPP" = "cc -E" ; then
        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
     fi
+
+$as_echo "#define _FORTIFY_SOURCE 0" >>confdefs.h
+
     ;;
 esac
 

scripts/configure.in

@@ -1367,6 +1367,7 @@ case $target in
     if test "$CPP" = "cc -E" ; then
        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
     fi
+    AC_DEFINE(_FORTIFY_SOURCE, 0, [Avoid checks on string overruns])
     ;;
 esac