luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #477 from YosysHQ/wasi_upstream 

MINGW and WASI compile fixes (from YosysHQ fork)
This commit is contained in:
alanminko 2026-02-01 07:55:05 -08:00 committed by GitHub
parent b6105230bf f2ae808236
commit 5fd7c57407
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aig/gia/giaKf.c
View File

@ -29,7 +29,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/aig/gia/giaTranStoch.c
View File

@ -37,7 +37,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/base/cmd/cmdAuto.c
View File

@ -29,7 +29,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/base/cmd/cmdStarter.c
View File

@ -27,7 +27,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/base/wlc/wlcPth.c
View File

@ -23,7 +23,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/map/if/ifDsd.c
View File

@ -32,7 +32,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/map/if/ifTest.c
View File

@ -23,7 +23,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

18
src/misc/util/utilAigSim.c
View File

@ -30,6 +30,8 @@
#define mkstemp(p) _mktemp_s(p, strlen(p)+1)
#else
#include <unistd.h> // mkstemp(), close(), unlink()
#include <fcntl.h>
#include <sys/stat.h>
#endif
#ifdef _WIN32
@ -333,8 +335,14 @@ static int ends_with(const char *s, const char *suf) {
static int make_tmp_file(char *path, size_t cap, const char *prefix) {
// Creates an existing temp file (for input)
#if defined(__wasm)
static int seq = 0; // no risk of collision since we're in a sandbox
snprintf(path, cap, "%s%08d", prefix, seq++);
int fd = open(path, O_CREAT | O_EXCL | O_RDWR, S_IREAD | S_IWRITE);
#else
snprintf(path, cap, "/tmp/%sXXXXXX", prefix);
int fd = mkstemp(path);
#endif
if (fd < 0) return 0;
close(fd);
return 1;
@ -342,8 +350,14 @@ static int make_tmp_file(char *path, size_t cap, const char *prefix) {
static int make_tmp_path_noexist(char *path, size_t cap, const char *prefix) {
// Creates a unique temp path that does not exist (for output)
#if defined(__wasm)
static int seq = 0; // no risk of collision since we're in a sandbox
snprintf(path, cap, "%s%08d", prefix, seq++);
int fd = open(path, O_CREAT | O_EXCL | O_RDWR, S_IREAD | S_IWRITE);
#else
snprintf(path, cap, "/tmp/%sXXXXXX", prefix);
int fd = mkstemp(path);
#endif
if (fd < 0) return 0;
close(fd);
unlink(path);
@ -612,7 +626,11 @@ static int SimulateCompareAigBin(const AigMan *p1, const char *bin,
// Run external binary: "<bin> <inFile> <outFile>"
remove(outFile);
snprintf(cmd, sizeof(cmd), "%s %s %s", bin, inFile, outFile);
#if defined(__wasm)
int rc = -1;
#else
int rc = system(cmd);
#endif
if (rc != 0) {
fprintf(stderr, "Error: system() failed (rc=%d): %s\n", rc, cmd);
goto fail;

4
src/misc/util/utilPth.c
View File

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <assert.h>
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include <windows.h>
#include <time.h>
// nanosleep implementation for Windows
@ -41,7 +41,7 @@ static inline int nanosleep(const struct timespec *req, struct timespec *rem) {
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/opt/ufar/UfarMgr.cpp
View File

@ -16,8 +16,6 @@
#ifdef _WIN32
#include <windows.h>
#else
#include <sys/wait.h>
#endif
#include <base/wlc/wlc.h>

6
src/opt/ufar/UfarPth.cpp
View File

@ -1,7 +1,7 @@
#include "misc/util/abc_namespaces.h"
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>
@ -188,6 +188,10 @@ class PDRWLA : public Solver {
Wlc_Par_t _Pars;
};
#if defined(__wasm)
static void pthread_exit(void *retval) __attribute__((noreturn)) { }
#endif
void KillOthers() {
pthread_cond_signal( &g_cond );
++g_nRunIds;

1
src/opt/untk/NtkNtk.cpp
View File

@ -9,7 +9,6 @@
#include <windows.h>
#else
#include <unistd.h>
#include <sys/wait.h>
#endif
#include <fstream>

2
src/opt/util/util.cpp
View File

@ -6,7 +6,9 @@
*/
#include <iomanip>
#if !defined(__wasm)
#include <csignal>
#endif
#ifdef _WIN32
#include <windows.h>
#else

2
src/proof/abs/absPth.c
View File

@ -25,7 +25,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/proof/cec/cecProve.c
View File

@ -30,7 +30,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/proof/cec/cecSplit.c
View File

@ -28,7 +28,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/proof/ssw/sswPart.c
View File

@ -25,7 +25,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include <windows.h>
#include <time.h>
#include "../lib/pthread.h"

2
src/sat/bmc/bmcBmcS.c
View File

@ -48,7 +48,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>

2
src/sat/cnf/cnfUtil.c
View File

@ -29,7 +29,7 @@
#ifdef ABC_USE_PTHREADS
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "../lib/pthread.h"
#else
#include <pthread.h>