Fix MacIntel build: "/nop" is illegal on Apple's older version of GAS

Patch by Nigel Pearson % nigel A ind P tansu P com P au %
Original thread:
Date: Nov 6, 2006 10:43 PM
Subject: [Ffmpeg-devel] [PATCH] swscale uses /nop, illegal for old versions of GAS

Originally committed as revision 20740 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index 04ccf1f..0dbc657 100644 (file)
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
@@ -60,8 +60,8 @@
 #define PREFETCH "#"
 #define PREFETCHW "#"
 #else
-#define PREFETCH "/nop"
-#define PREFETCHW "/nop"
+#define PREFETCH  " # nop"
+#define PREFETCHW " # nop"
 #endif
 #endif
 
@@ -77,11 +77,7 @@
 #define SFENCE "sfence"
 #else
 #define MOVNTQ "movq"
-#ifdef __APPLE__
-#define SFENCE "#"
-#else
-#define SFENCE "/nop"
-#endif
+#define SFENCE " # nop"
 #endif
 
 static inline void RENAME(rgb24to32)(const uint8_t *src,uint8_t *dst,long src_size)

diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index 773f8f7..d0f8d7d 100644 (file)
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -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