[berkeley-abc] 02/03: Refreshed patches
Ruben Undheim
rubund-guest at moszumanska.debian.org
Fri May 29 14:26:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository berkeley-abc.
commit aed50e7c0d6a1fdd9b0c9947d1cbca5d801cfc89
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Fri May 29 16:15:54 2015 +0200
Refreshed patches
---
debian/patches/04_memory_alignment_fix.patch | 55 ---------------------------
debian/patches/abc-bugfix-20150403.diff | 15 --------
debian/patches/cflags_ldflags.patch | 8 ++--
debian/patches/remove_bzlib_convenience.patch | 20 +++++-----
debian/patches/remove_zlib_convenience.patch | 24 ++++++------
debian/patches/reproducibility.patch | 12 +++---
debian/patches/series | 2 -
debian/patches/writepla.patch | 22 +++++------
8 files changed, 43 insertions(+), 115 deletions(-)
diff --git a/debian/patches/04_memory_alignment_fix.patch b/debian/patches/04_memory_alignment_fix.patch
deleted file mode 100644
index 33c77d1..0000000
--- a/debian/patches/04_memory_alignment_fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Backporting a fix which causes crashes on certain architectures.
- There were some memory alignment problems
-Author: Clifford Wolf <clifford at clifford.at>
-Forwarded: Came from upstream - therefore no need
-Index: berkeley-abc/Makefile
-===================================================================
---- berkeley-abc.orig/Makefile
-+++ berkeley-abc/Makefile
-@@ -45,6 +45,9 @@ ARCHFLAGS ?= $(shell $(CC) arch_flags.c
- OPTFLAGS ?= -g -O #-DABC_NAMESPACE=xxx
-
- CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
-+ifneq ($(findstring arm,$(shell uname -m)),)
-+ CFLAGS += -DABC_MEMALIGN=4
-+endif
-
- # Set -Wno-unused-bug-set-variable for GCC 4.6.0 and greater only
- ifneq ($(or $(findstring gcc,$(CC)),$(findstring g++,$(CC))),)
-Index: berkeley-abc/src/aig/aig/aigMem.c
-===================================================================
---- berkeley-abc.orig/src/aig/aig/aigMem.c
-+++ berkeley-abc/src/aig/aig/aigMem.c
-@@ -366,6 +366,10 @@ void Aig_MmFlexStop( Aig_MmFlex_t * p, i
- char * Aig_MmFlexEntryFetch( Aig_MmFlex_t * p, int nBytes )
- {
- char * pTemp;
-+#ifdef ABC_MEMALIGN
-+ // extend size to max alignment
-+ nBytes += (ABC_MEMALIGN - nBytes % ABC_MEMALIGN) % ABC_MEMALIGN;
-+#endif
- // check if there are still free entries
- if ( p->pCurrent == NULL || p->pCurrent + nBytes > p->pEnd )
- { // need to allocate more entries
-@@ -535,6 +539,10 @@ char * Aig_MmStepEntryFetch( Aig_MmStep_
- {
- if ( nBytes == 0 )
- return NULL;
-+#ifdef ABC_MEMALIGN
-+ // extend size to max alignment
-+ nBytes += (ABC_MEMALIGN - nBytes % ABC_MEMALIGN) % ABC_MEMALIGN;
-+#endif
- if ( nBytes > p->nMapSize )
- {
- if ( p->nChunks == p->nChunksAlloc )
-@@ -564,6 +572,10 @@ void Aig_MmStepEntryRecycle( Aig_MmStep_
- {
- if ( nBytes == 0 )
- return;
-+#ifdef ABC_MEMALIGN
-+ // extend size to max alignment
-+ nBytes += (ABC_MEMALIGN - nBytes % ABC_MEMALIGN) % ABC_MEMALIGN;
-+#endif
- if ( nBytes > p->nMapSize )
- {
- // ABC_FREE( pEntry );
diff --git a/debian/patches/abc-bugfix-20150403.diff b/debian/patches/abc-bugfix-20150403.diff
deleted file mode 100644
index 3c2125e..0000000
--- a/debian/patches/abc-bugfix-20150403.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Comment: Fixes a segfault seen on Ubuntu 15.04
-Author: Clifford Wolf <clifford at clifford.at>
-Index: berkeley-abc/src/opt/ret/retIncrem.c
-===================================================================
---- berkeley-abc.orig/src/opt/ret/retIncrem.c 2015-04-03 18:36:00.361381237 +0200
-+++ berkeley-abc/src/opt/ret/retIncrem.c 2015-04-03 18:36:00.357383236 +0200
-@@ -176,7 +176,7 @@
- {
- // this is an old latch
- // get its number in the original order
-- if ( ! st__lookup( tLatches, (char *)pLatch, (char **)&Index ) )
-+ if ( ! st__lookup_int( tLatches, (char *)pLatch, &Index ) )
- {
- printf( "Abc_NtkRetimeFinalizeLatches(): Internal error.\n" );
- return 0;
diff --git a/debian/patches/cflags_ldflags.patch b/debian/patches/cflags_ldflags.patch
index eefdc8d..18f052a 100644
--- a/debian/patches/cflags_ldflags.patch
+++ b/debian/patches/cflags_ldflags.patch
@@ -4,9 +4,9 @@ Forwarded: doesn't make sense upstream
Author: Ruben Undheim <ruben.undheim at gmail.com>
Index: berkeley-abc/Makefile
===================================================================
---- berkeley-abc.orig/Makefile 2014-11-08 23:33:21.546883879 +0100
-+++ berkeley-abc/Makefile 2014-11-08 23:35:00.494883245 +0100
-@@ -104,27 +104,27 @@
+--- berkeley-abc.orig/Makefile
++++ berkeley-abc/Makefile
+@@ -109,27 +109,27 @@ DEP := $(OBJ:.o=.d)
%.o: %.c
@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
@@ -40,7 +40,7 @@ Index: berkeley-abc/Makefile
-include $(DEP)
-@@ -141,7 +141,7 @@
+@@ -146,7 +146,7 @@ tags:
$(PROG): $(OBJ)
@echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@)
diff --git a/debian/patches/remove_bzlib_convenience.patch b/debian/patches/remove_bzlib_convenience.patch
index d5b8f44..02032cb 100644
--- a/debian/patches/remove_bzlib_convenience.patch
+++ b/debian/patches/remove_bzlib_convenience.patch
@@ -5,9 +5,9 @@ Forwarded: doesn't make sense upstream
Author: Ruben Undheim <ruben.undheim at gmail.com>
Index: berkeley-abc/Makefile
===================================================================
---- berkeley-abc.orig/Makefile 2014-11-08 23:29:36.846885317 +0100
-+++ berkeley-abc/Makefile 2014-11-08 23:31:17.746884671 +0100
-@@ -20,7 +20,7 @@
+--- berkeley-abc.orig/Makefile
++++ berkeley-abc/Makefile
+@@ -20,7 +20,7 @@ MODULES := \
src/map/mapper src/map/mio src/map/super src/map/if \
src/map/amap src/map/cov src/map/scl src/map/mpm \
src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
@@ -16,19 +16,19 @@ Index: berkeley-abc/Makefile
src/misc/mem src/misc/bar src/misc/bbl \
src/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
src/opt/ret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
-@@ -67,7 +67,7 @@
+@@ -72,7 +72,7 @@ endif
endif
# LIBS := -ldl -lrt
--LIBS += -ldl
-+LIBS += -ldl -lbz2
+-LIBS += -ldl -lm
++LIBS += -ldl -lm -lbz2
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
Index: berkeley-abc/src/base/io/ioReadAiger.c
===================================================================
---- berkeley-abc.orig/src/base/io/ioReadAiger.c 2014-11-08 23:29:36.846885317 +0100
-+++ berkeley-abc/src/base/io/ioReadAiger.c 2014-11-08 23:29:36.842885317 +0100
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c
++++ berkeley-abc/src/base/io/ioReadAiger.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
@@ -40,8 +40,8 @@ Index: berkeley-abc/src/base/io/ioReadAiger.c
Index: berkeley-abc/src/base/io/ioWriteAiger.c
===================================================================
---- berkeley-abc.orig/src/base/io/ioWriteAiger.c 2014-11-08 23:29:36.846885317 +0100
-+++ berkeley-abc/src/base/io/ioWriteAiger.c 2014-11-08 23:29:36.842885317 +0100
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c
++++ berkeley-abc/src/base/io/ioWriteAiger.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
diff --git a/debian/patches/remove_zlib_convenience.patch b/debian/patches/remove_zlib_convenience.patch
index 60ae763..8d823c2 100644
--- a/debian/patches/remove_zlib_convenience.patch
+++ b/debian/patches/remove_zlib_convenience.patch
@@ -5,9 +5,9 @@ Forwarded: doesn't make sense upstream
Author: Ruben Undheim <ruben.undheim at gmail.com>
Index: berkeley-abc/Makefile
===================================================================
---- berkeley-abc.orig/Makefile 2014-11-08 23:31:40.998884522 +0100
-+++ berkeley-abc/Makefile 2014-11-08 23:32:23.030884253 +0100
-@@ -20,7 +20,7 @@
+--- berkeley-abc.orig/Makefile
++++ berkeley-abc/Makefile
+@@ -20,7 +20,7 @@ MODULES := \
src/map/mapper src/map/mio src/map/super src/map/if \
src/map/amap src/map/cov src/map/scl src/map/mpm \
src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
@@ -16,19 +16,19 @@ Index: berkeley-abc/Makefile
src/misc/mem src/misc/bar src/misc/bbl \
src/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
src/opt/ret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
-@@ -67,7 +67,7 @@
+@@ -72,7 +72,7 @@ endif
endif
# LIBS := -ldl -lrt
--LIBS += -ldl -lbz2
-+LIBS += -ldl -lbz2 -lz
+-LIBS += -ldl -lm -lbz2
++LIBS += -ldl -lm -lbz2 -lz
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
Index: berkeley-abc/src/base/io/ioReadAiger.c
===================================================================
---- berkeley-abc.orig/src/base/io/ioReadAiger.c 2014-11-08 23:31:40.998884522 +0100
-+++ berkeley-abc/src/base/io/ioReadAiger.c 2014-11-08 23:31:40.994884522 +0100
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c
++++ berkeley-abc/src/base/io/ioReadAiger.c
@@ -27,7 +27,7 @@
#include <assert.h>
@@ -40,8 +40,8 @@ Index: berkeley-abc/src/base/io/ioReadAiger.c
ABC_NAMESPACE_IMPL_START
Index: berkeley-abc/src/base/io/ioWriteAiger.c
===================================================================
---- berkeley-abc.orig/src/base/io/ioWriteAiger.c 2014-11-08 23:31:40.998884522 +0100
-+++ berkeley-abc/src/base/io/ioWriteAiger.c 2014-11-08 23:31:40.994884522 +0100
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c
++++ berkeley-abc/src/base/io/ioWriteAiger.c
@@ -27,7 +27,7 @@
#include <assert.h>
@@ -53,8 +53,8 @@ Index: berkeley-abc/src/base/io/ioWriteAiger.c
Index: berkeley-abc/src/sat/cnf/cnfMan.c
===================================================================
---- berkeley-abc.orig/src/sat/cnf/cnfMan.c 2014-11-08 23:31:40.998884522 +0100
-+++ berkeley-abc/src/sat/cnf/cnfMan.c 2014-11-08 23:31:40.994884522 +0100
+--- berkeley-abc.orig/src/sat/cnf/cnfMan.c
++++ berkeley-abc/src/sat/cnf/cnfMan.c
@@ -21,7 +21,7 @@
#include "cnf.h"
#include "sat/bsat/satSolver.h"
diff --git a/debian/patches/reproducibility.patch b/debian/patches/reproducibility.patch
index 3041f1d..2b86afd 100644
--- a/debian/patches/reproducibility.patch
+++ b/debian/patches/reproducibility.patch
@@ -3,9 +3,9 @@ Description: Remove the __TIME__ etc macros
Author: Johann Klammer <klammerj at a1.net>
Index: berkeley-abc/src/base/cmd/cmdUtils.c
===================================================================
---- berkeley-abc.orig/src/base/cmd/cmdUtils.c 2015-03-31 16:07:23.502493594 +0200
-+++ berkeley-abc/src/base/cmd/cmdUtils.c 2015-03-31 16:07:23.494493594 +0200
-@@ -589,7 +589,7 @@
+--- berkeley-abc.orig/src/base/cmd/cmdUtils.c
++++ berkeley-abc/src/base/cmd/cmdUtils.c
+@@ -589,7 +589,7 @@ void CmdCommandPrint( Abc_Frame_t * pAbc
nColumns = 79 / (LenghtMax + 2);
// print the starting message
@@ -16,9 +16,9 @@ Index: berkeley-abc/src/base/cmd/cmdUtils.c
sGroupCur = NULL;
Index: berkeley-abc/src/base/main/mainUtils.c
===================================================================
---- berkeley-abc.orig/src/base/main/mainUtils.c 2015-03-31 16:07:23.502493594 +0200
-+++ berkeley-abc/src/base/main/mainUtils.c 2015-03-31 16:07:23.498493594 +0200
-@@ -52,7 +52,7 @@
+--- berkeley-abc.orig/src/base/main/mainUtils.c
++++ berkeley-abc/src/base/main/mainUtils.c
+@@ -52,7 +52,7 @@ static char * DateReadFromDateString( ch
char * Abc_UtilsGetVersion( Abc_Frame_t * pAbc )
{
static char Version[1000];
diff --git a/debian/patches/series b/debian/patches/series
index ad702a2..55f6398 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
remove_bzlib_convenience.patch
remove_zlib_convenience.patch
cflags_ldflags.patch
-04_memory_alignment_fix.patch
reproducibility.patch
writepla.patch
-abc-bugfix-20150403.diff
diff --git a/debian/patches/writepla.patch b/debian/patches/writepla.patch
index 068173b..6552505 100644
--- a/debian/patches/writepla.patch
+++ b/debian/patches/writepla.patch
@@ -4,14 +4,14 @@ Forwarded: https://bitbucket.org/alanmi/abc/issue/27/assertion-failure-in-write_
Author: Johann Klammer <klammerj at a1.net>
Index: berkeley-abc/src/base/io/ioWritePla.c
===================================================================
---- berkeley-abc.orig/src/base/io/ioWritePla.c 2015-03-31 17:11:10.153821268 +0200
-+++ berkeley-abc/src/base/io/ioWritePla.c 2015-03-31 17:11:10.149821268 +0200
-@@ -50,7 +50,7 @@
- FILE * pFile;
-
- assert( Abc_NtkIsSopNetlist(pNtk) );
-- assert( Abc_NtkLevel(pNtk) == 1 );
-+ assert( Abc_NtkLevel(pNtk) <= 1 );
-
- pFile = fopen( pFileName, "w" );
- if ( pFile == NULL )
+--- berkeley-abc.orig/src/base/io/ioWritePla.c
++++ berkeley-abc/src/base/io/ioWritePla.c
+@@ -171,7 +171,7 @@ int Io_WritePla( Abc_Ntk_t * pNtk, char
+ FILE * pFile;
+
+ assert( Abc_NtkIsSopNetlist(pNtk) );
+- assert( Abc_NtkLevel(pNtk) == 1 );
++ assert( Abc_NtkLevel(pNtk) <= 1 );
+
+ pFile = fopen( pFileName, "w" );
+ if ( pFile == NULL )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/berkeley-abc.git
More information about the debian-science-commits
mailing list