From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 21 Jun 2019 21:35:58 +0000 (-0700)
Subject: One more workaround for gcc-4.8
X-Git-Tag: working-ls180~1208^2~114^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e581a3e6f4c8763c6a308d1330dbf1ee4bb19499;p=yosys.git

One more workaround for gcc-4.8
---

diff --git a/backends/aiger/xaiger.cc b/backends/aiger/xaiger.cc
index 6718e4f2c..637c54ff9 100644
--- a/backends/aiger/xaiger.cc
+++ b/backends/aiger/xaiger.cc
@@ -429,12 +429,13 @@ struct XAigerWriter
 				module->connect(new_bit, bit);
 				if (not_map.count(bit))
 					not_map[new_bit] = not_map.at(bit);
-				else if (and_map.count(bit))
-					and_map[new_bit] = and_map.at(bit);
+				else if (and_map.count(bit)) {
+				    //and_map[new_bit] = and_map.at(bit); // Breaks gcc-4.8
+				    and_map.insert(std::make_pair(new_bit, and_map.at(bit)));
+				}
 				else if (alias_map.count(bit))
 					alias_map[new_bit] = alias_map.at(bit);
 				else
-					//log_abort();
 					alias_map[new_bit] = bit;
 				output_bits.erase(bit);
 				output_bits.insert(new_bit);