diff --git a/README.md b/README.md index 5f492fcea..ff47a8a38 100755 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ For previous versions, please read: ## V3 changes -* v3.0, 2019-12-25, For [#1537][bug #1537], support aarch64 for armv8. 3.0.84 +* v3.0, 2019-12-25, For [#1537][bug #1537], [#1282][bug #1282], support aarch64 for armv8. 3.0.84 * v3.0, 2019-12-25, For [#1538][bug #1538], fresh chunk allow fmt=0 or fmt=1. 3.0.83 * v3.0, 2019-12-25, Remove FFMPEG and NGINX, please use [srs-docker](https://github.com/ossrs/srs-docker) instead. 3.0.82 * v3.0, 2019-12-25, For [#1537][bug #1537], remove cross-build, not used patches, directly build st. @@ -1559,6 +1559,7 @@ Winlin [bug #1535]: https://github.com/ossrs/srs/issues/1535 [bug #1537]: https://github.com/ossrs/srs/issues/1537 [bug #1538]: https://github.com/ossrs/srs/issues/1538 +[bug #1282]: https://github.com/ossrs/srs/issues/1282 [bug #xxxxxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/3rdparty/st-srs/README.md b/trunk/3rdparty/st-srs/README.md index 62d22829f..60fc1a651 100644 --- a/trunk/3rdparty/st-srs/README.md +++ b/trunk/3rdparty/st-srs/README.md @@ -21,6 +21,7 @@ The branch [srs](https://github.com/ossrs/state-threads/tree/srs) will be patche - [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). +- [x] Merge patch [srs#1282](https://github.com/ossrs/srs/issues/1282#issuecomment-445539513) to support aarch64, [#9](https://github.com/ossrs/state-threads/issues/9). ## Docs diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index d27ecb689..a97c1de83 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -97,7 +97,7 @@ #ifndef SRS_EXPORT_LIBRTMP // Checking for st(state-threads), only support the following cpus: i386/amd64/x86_64/arm // @reamrk To patch ST for arm, read https://github.com/ossrs/state-threads/issues/1 - #if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__) + #if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__) && !defined(__aarch64__) #error "only support i386/amd64/x86_64/arm cpu" #endif #endif