Exported patches from gdp-pq

1 files changed, 55 insertions, 43 deletions

diff --git a/debian/patches/kfreebsd-support.patch b/debian/patches/kfreebsd-support.patch
index 18e47cc9..49be947a 100644
--- a/debian/patches/kfreebsd-support.patch
+++ b/debian/patches/kfreebsd-support.patch
@@ -1,13 +1,25 @@
 From: Sebastian Kuzminsky <seb@highlab.com>
-Subject: Change yosys to look for the #define constant "__unix__"
-  instead of "__linux__", to select code appropriate for Unix-like
-  systems.  This has been tested with Clang 3.5 and GCC 4.6, 4.8, and
-  4.9 on Linux, and Clang 3.5 and GCC 4.9 on kFreeBSD.
+Date: Sat, 14 May 2016 15:44:13 +0200
+Subject: Change yosys to look for the #define constant "__unix__" instead of
+ "__linux__",
+ to select code appropriate for Unix-like systems. This has been tested with
+ Clang 3.5 and GCC 4.6, 4.8, and 4.9 on Linux,
+ and Clang 3.5 and GCC 4.9 on kFreeBSD.
 
-Index: yosys/kernel/driver.cc
-===================================================================
---- yosys.orig/kernel/driver.cc	2016-04-07 11:33:18.000000000 -0600
-+++ yosys/kernel/driver.cc	2016-04-07 11:35:04.000000000 -0600
+---
+ kernel/driver.cc       | 6 +++---
+ kernel/log.cc          | 6 +++---
+ kernel/log.h           | 2 +-
+ kernel/yosys.cc        | 4 ++--
+ libs/minisat/System.cc | 4 ++--
+ libs/minisat/System.h  | 2 +-
+ passes/cmds/cover.cc   | 2 +-
+ 7 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/kernel/driver.cc b/kernel/driver.cc
+index 02e332f..dacffb1 100644
+--- a/kernel/driver.cc
++++ b/kernel/driver.cc
 @@ -30,7 +30,7 @@
  #include <limits.h>
  #include <errno.h>
@@ -17,7 +29,7 @@ Index: yosys/kernel/driver.cc
  #  include <sys/types.h>
  #  include <unistd.h>
  #endif
-@@ -382,7 +382,7 @@
+@@ -382,7 +382,7 @@ int main(int argc, char **argv)
  #else
  		std::string meminfo;
  		std::string stats_divider = ", ";
@@ -26,7 +38,7 @@ Index: yosys/kernel/driver.cc
  		std::ifstream statm;
  		statm.open(stringf("/proc/%lld/statm", (long long)getpid()));
  		if (statm.is_open()) {
-@@ -436,7 +436,7 @@
+@@ -436,7 +436,7 @@ int main(int argc, char **argv)
  		}
  	}
  
@@ -35,10 +47,10 @@ Index: yosys/kernel/driver.cc
  	if (getenv("YOSYS_COVER_DIR") || getenv("YOSYS_COVER_FILE"))
  	{
  		string filename;
-Index: yosys/kernel/log.cc
-===================================================================
---- yosys.orig/kernel/log.cc	2016-04-07 11:33:18.000000000 -0600
-+++ yosys/kernel/log.cc	2016-04-07 11:35:04.000000000 -0600
+diff --git a/kernel/log.cc b/kernel/log.cc
+index 4f395c7..8e1279f 100644
+--- a/kernel/log.cc
++++ b/kernel/log.cc
 @@ -25,7 +25,7 @@
  #  include <sys/time.h>
  #endif
@@ -48,7 +60,7 @@ Index: yosys/kernel/log.cc
  #  include <dlfcn.h>
  #endif
  
-@@ -264,7 +264,7 @@
+@@ -264,7 +264,7 @@ void log_pop()
  	log_flush();
  }
  
@@ -57,7 +69,7 @@ Index: yosys/kernel/log.cc
  void log_backtrace(const char *prefix, int levels)
  {
  	if (levels <= 0) return;
-@@ -423,7 +423,7 @@
+@@ -423,7 +423,7 @@ void log_cell(RTLIL::Cell *cell, std::string indent)
  // ---------------------------------------------------
  // This is the magic behind the code coverage counters
  // ---------------------------------------------------
@@ -66,11 +78,11 @@ Index: yosys/kernel/log.cc
  
  dict<std::string, std::pair<std::string, int>> extra_coverage_data;
  
-Index: yosys/kernel/log.h
-===================================================================
---- yosys.orig/kernel/log.h	2016-04-07 11:33:18.000000000 -0600
-+++ yosys/kernel/log.h	2016-04-07 11:35:04.000000000 -0600
-@@ -102,7 +102,7 @@
+diff --git a/kernel/log.h b/kernel/log.h
+index 28baf98..f2f3a5e 100644
+--- a/kernel/log.h
++++ b/kernel/log.h
+@@ -102,7 +102,7 @@ static inline void log_assert_worker(bool cond, const char *expr, const char *fi
  // This is the magic behind the code coverage counters
  // ---------------------------------------------------
  
@@ -79,11 +91,11 @@ Index: yosys/kernel/log.h
  
  #define cover(_id) do { \
      static CoverData __d __attribute__((section("yosys_cover_list"), aligned(1), used)) = { __FILE__, __FUNCTION__, _id, __LINE__, 0 }; \
-Index: yosys/kernel/yosys.cc
-===================================================================
---- yosys.orig/kernel/yosys.cc	2016-04-07 11:33:18.000000000 -0600
-+++ yosys/kernel/yosys.cc	2016-04-07 11:35:04.000000000 -0600
-@@ -64,7 +64,7 @@
+diff --git a/kernel/yosys.cc b/kernel/yosys.cc
+index eba1aef..cb14c93 100644
+--- a/kernel/yosys.cc
++++ b/kernel/yosys.cc
+@@ -64,7 +64,7 @@ std::vector<void*> memhasher_store;
  
  void memhasher_on()
  {
@@ -92,7 +104,7 @@ Index: yosys/kernel/yosys.cc
  	memhasher_rng += time(NULL) << 16 ^ getpid();
  #endif
  	memhasher_store.resize(0x10000);
-@@ -622,7 +622,7 @@
+@@ -622,7 +622,7 @@ struct TclPass : public Pass {
  } TclPass;
  #endif
  
@@ -101,11 +113,11 @@ Index: yosys/kernel/yosys.cc
  std::string proc_self_dirname()
  {
  	char path[PATH_MAX];
-Index: yosys/libs/minisat/System.cc
-===================================================================
---- yosys.orig/libs/minisat/System.cc	2016-04-07 11:33:18.000000000 -0600
-+++ yosys/libs/minisat/System.cc	2016-04-07 11:35:04.000000000 -0600
-@@ -25,7 +25,7 @@
+diff --git a/libs/minisat/System.cc b/libs/minisat/System.cc
+index febe3b4..3df1810 100644
+--- a/libs/minisat/System.cc
++++ b/libs/minisat/System.cc
+@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
  
  #include "System.h"
  
@@ -114,7 +126,7 @@ Index: yosys/libs/minisat/System.cc
  
  #include <stdlib.h>
  
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ double Minisat::memUsedPeak(bool) { return 0; }
  
  void Minisat::setX86FPUPrecision()
  {
@@ -123,11 +135,11 @@ Index: yosys/libs/minisat/System.cc
      // Only correct FPU precision on Linux architectures that needs and supports it:
      fpu_control_t oldcw, newcw;
      _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
-Index: yosys/libs/minisat/System.h
-===================================================================
---- yosys.orig/libs/minisat/System.h	2016-04-07 11:33:18.000000000 -0600
-+++ yosys/libs/minisat/System.h	2016-04-07 11:35:04.000000000 -0600
-@@ -21,7 +21,7 @@
+diff --git a/libs/minisat/System.h b/libs/minisat/System.h
+index ee92a6e..8ad9902 100644
+--- a/libs/minisat/System.h
++++ b/libs/minisat/System.h
+@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
  #ifndef Minisat_System_h
  #define Minisat_System_h
  
@@ -136,11 +148,11 @@ Index: yosys/libs/minisat/System.h
  #include <fpu_control.h>
  #endif
  
-Index: yosys/passes/cmds/cover.cc
-===================================================================
---- yosys.orig/passes/cmds/cover.cc	2016-04-07 11:33:18.000000000 -0600
-+++ yosys/passes/cmds/cover.cc	2016-04-07 11:35:04.000000000 -0600
-@@ -128,7 +128,7 @@
+diff --git a/passes/cmds/cover.cc b/passes/cmds/cover.cc
+index 5644066..e3910eb 100644
+--- a/passes/cmds/cover.cc
++++ b/passes/cmds/cover.cc
+@@ -128,7 +128,7 @@ struct CoverPass : public Pass {
  			log("\n");
  		}