changeset 20724:b8fe18a742ce

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
author gpoirier
date Tue, 07 Nov 2006 07:07:05 +0000
parents 18ba5bc68f40
children 873f7484ccdd
files libswscale/rgb2rgb_template.c libswscale/swscale_template.c
diffstat 2 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/rgb2rgb_template.c	Mon Nov 06 22:57:14 2006 +0000
+++ b/libswscale/rgb2rgb_template.c	Tue Nov 07 07:07:05 2006 +0000
@@ -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)
--- a/libswscale/swscale_template.c	Mon Nov 06 22:57:14 2006 +0000
+++ b/libswscale/swscale_template.c	Tue Nov 07 07:07:05 2006 +0000
@@ -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