Skip to content

Commit cd68bfa

Browse files
committed
Fix #8, support disable ASM to avoid building bug.
1 parent 4947dad commit cd68bfa

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The branch [srs](https://github.com/ossrs/state-threads/tree/srs) will be patche
2020
- [x] Merge from [michaeltalyansky](https://github.com/michaeltalyansky/state-threads) and [xzh3836598](https://github.com/ossrs/state-threads/commit/9a17dec8f9c2814d93761665df7c5575a4d2d8a3), support [ARM](https://github.com/ossrs/state-threads/issues/1).
2121
- [x] Merge from [toffaletti](https://github.com/toffaletti/state-threads), support [valgrind](https://github.com/ossrs/state-threads/issues/2) for ST.
2222
- [x] Patch [st.osx10.14.build.patch](https://github.com/ossrs/srs/blob/2.0release/trunk/3rdparty/patches/6.st.osx10.14.build.patch), for osx 10.14 build.
23+
- [x] Support macro `MD_ST_NO_ASM` to disable ASM, [#8](https://github.com/ossrs/state-threads/issues/8).
2324

2425
## Docs
2526

md.S

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#if defined(MD_USE_BUILTIN_SETJMP)
1+
2+
/* If user disable the ASM, such as avoiding bugs in ASM, donot compile it. */
3+
#if !defined(MD_ST_NO_ASM)
24

35
/*
46
* Portions created by SGI are Copyright (C) 2000 Silicon Graphics, Inc.

0 commit comments

Comments
 (0)