Additional corrections to the new ReRAM layers in the magic tech
files.  Also corrected the GDS-exact tech file to avoid having
text or pin purpose metals erase vias when they overdraw them.
diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index 74c730b..7bad45a 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -3566,19 +3566,23 @@
 #endif (MIM)
 
 #ifdef RERAM
+#undef RERAM
  layer reram RERAM
  and VIA1
  grow 55
+#define RERAM
 #endif (RERAM)
 
  templayer m2cbase VIA1
  and-not COREID
-#ifdef RERAM
- and-not RERAM
-#endif (RERAM)
  grow 5
  or VIA1
  grow 50
+#ifdef RERAM
+#undef RERAM
+ and-not RERAM
+#define RERAM
+#endif (RERAM)
 
  layer m2c m2cbase
  grow 30
@@ -4021,7 +4025,9 @@
  calma MET1 68 20
  calma VIA1 68 44
 #ifdef RERAM
+#undef RERAM
  calma RERAM 201 20
+#define RERAM
 #endif (RERAM)
  calma MET2 69 20
  calma VIA2 69 44