Commit b2d5acb8 authored by gpoirier's avatar gpoirier

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


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@20740 b3059339-0415-0410-9bf9-f77b7e298cf2
parent cc3038c5
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
#define PREFETCH "#" #define PREFETCH "#"
#define PREFETCHW "#" #define PREFETCHW "#"
#else #else
#define PREFETCH "/nop" #define PREFETCH " # nop"
#define PREFETCHW "/nop" #define PREFETCHW " # nop"
#endif #endif
#endif #endif
...@@ -77,11 +77,7 @@ ...@@ -77,11 +77,7 @@
#define SFENCE "sfence" #define SFENCE "sfence"
#else #else
#define MOVNTQ "movq" #define MOVNTQ "movq"
#ifdef __APPLE__ #define SFENCE " # nop"
#define SFENCE "#"
#else
#define SFENCE "/nop"
#endif
#endif #endif
static inline void RENAME(rgb24to32)(const uint8_t *src,uint8_t *dst,long src_size) static inline void RENAME(rgb24to32)(const uint8_t *src,uint8_t *dst,long src_size)
......
...@@ -43,14 +43,14 @@ ...@@ -43,14 +43,14 @@
#define PREFETCH "prefetchnta" #define PREFETCH "prefetchnta"
#define PREFETCHW "prefetcht0" #define PREFETCHW "prefetcht0"
#else #else
#define PREFETCH "/nop" #define PREFETCH " # nop"
#define PREFETCHW "/nop" #define PREFETCHW " # nop"
#endif #endif
#ifdef HAVE_MMX2 #ifdef HAVE_MMX2
#define SFENCE "sfence" #define SFENCE "sfence"
#else #else
#define SFENCE "/nop" #define SFENCE " # nop"
#endif #endif
#ifdef HAVE_MMX2 #ifdef HAVE_MMX2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment