From 97bb8a5405be7749aeac2c24dedfa09b305a246d Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 25 Dec 2019 16:22:00 +0800 Subject: [PATCH] For #1537, #1282, support disable ASM to avoid building bug. --- trunk/3rdparty/st-srs/README.md | 1 + trunk/3rdparty/st-srs/md.S | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/trunk/3rdparty/st-srs/README.md b/trunk/3rdparty/st-srs/README.md index a0b17dfb2..62d22829f 100644 --- a/trunk/3rdparty/st-srs/README.md +++ b/trunk/3rdparty/st-srs/README.md @@ -20,6 +20,7 @@ The branch [srs](https://github.com/ossrs/state-threads/tree/srs) will be patche - [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). - [x] Merge from [toffaletti](https://github.com/toffaletti/state-threads), support [valgrind](https://github.com/ossrs/state-threads/issues/2) for ST. - [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. +- [x] Support macro `MD_ST_NO_ASM` to disable ASM, [#8](https://github.com/ossrs/state-threads/issues/8). ## Docs diff --git a/trunk/3rdparty/st-srs/md.S b/trunk/3rdparty/st-srs/md.S index 7b444a93f..7aa5f5b1f 100644 --- a/trunk/3rdparty/st-srs/md.S +++ b/trunk/3rdparty/st-srs/md.S @@ -1,4 +1,6 @@ -#if defined(MD_USE_BUILTIN_SETJMP) + +/* If user disable the ASM, such as avoiding bugs in ASM, donot compile it. */ +#if !defined(MD_ST_NO_ASM) /* * Portions created by SGI are Copyright (C) 2000 Silicon Graphics, Inc.