[FFmpeg-cvslog] Merge commit '75ef91543422049a01b594925fcdb182ea12eb09'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 23 20:46:55 2017 -0300| [acf70639fb534a4ae9b1e4c76153f0faa0bda190] | committer: James Almer

Merge commit '75ef91543422049a01b594925fcdb182ea12eb09'

* commit '75ef91543422049a01b594925fcdb182ea12eb09':
  configure: Disable inline assembly for PathScale compilers

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acf70639fb534a4ae9b1e4c76153f0faa0bda190
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index ae46567751..7a53bc76c7 100755
--- a/configure
+++ b/configure
@@ -6553,6 +6553,7 @@ elif enabled tms470; then
     disable inline_asm
 elif enabled pathscale; then
     add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
+    disable inline_asm
 elif enabled_any msvc icl; then
     enabled x86_32 && disable aligned_stack
     enabled_all x86_32 debug && add_cflags -Oy-


======================================================================