[Ffmpeg-devel] [PATCH] swscale uses /nop, illegal for old versions of GAS

[Nigel Pearson]

If swscale is enabled, Intel Mac builds will fail, because
libswscale/swscale_template.c uses the illegal sequence '/nop'.
libswscale/rgb2rgb_template.c already has a fix if __APPLE__
is defined, but for consistency this is patched in the same way.


% svn info libswscale
Path: libswscale
URL: svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Repository UUID: b3059339-0415-0410-9bf9-f77b7e298cf2
Revision: 20736
Node Kind: directory
Schedule: normal
Last Changed Author: lucabe
Last Changed Rev: 20605
Last Changed Date: 2006-11-02 20:01:01 +1100 (Thu, 02 Nov 2006)
Properties Last Updated: 2006-11-06 22:04:24 +1100 (Mon, 06 Nov 2006)

% svn diff libswscale
Index: libswscale/rgb2rgb_template.c
===================================================================
--- libswscale/rgb2rgb_template.c       (revision 20736)
+++ libswscale/rgb2rgb_template.c       (working copy)
@@ -60,8 +60,8 @@
#define PREFETCH "#"
#define PREFETCHW "#"
#else
-#define PREFETCH "/nop"
-#define PREFETCHW "/nop"
+#define PREFETCH  " # nop"
+#define PREFETCHW " # nop"
#endif
#endif
@@ -77,12 +77,8 @@
#define SFENCE "sfence"
#else
#define MOVNTQ "movq"
-#ifdef __APPLE__
-#define SFENCE "#"
-#else
-#define SFENCE "/nop"
+#define SFENCE " # nop"
#endif
-#endif
static inline void RENAME(rgb24to32)(const uint8_t *src,uint8_t  
*dst,long src_size)
{
Index: libswscale/swscale_template.c
===================================================================
--- libswscale/swscale_template.c       (revision 20736)
+++ libswscale/swscale_template.c       (working copy)
@@ -43,14 +43,14 @@
#define PREFETCH "prefetchnta"
#define PREFETCHW "prefetcht0"
#else
-#define PREFETCH "/nop"
-#define PREFETCHW "/nop"
+#define PREFETCH  " # nop"
+#define PREFETCHW " # nop"
#endif
#ifdef HAVE_MMX2
#define SFENCE "sfence"
#else
-#define SFENCE "/nop"
+#define SFENCE " # nop"
#endif
#ifdef HAVE_MMX2

%

--
Nigel Pearson, nigel at ind.tansu.com.au|  4  8
Telstra Net. Eng., Sydney, Australia | 15 16
Office: 9202 3900    Fax:  9261 3912 | 23 42
Mobile: 0408 664435  Home: 9792 6998 |  Lost