diff options
| author | Bartek Rutkowski <robak@FreeBSD.org> | 2015-03-19 19:23:09 +0000 |
|---|---|---|
| committer | Bartek Rutkowski <robak@FreeBSD.org> | 2015-03-19 19:23:09 +0000 |
| commit | a6a8ed7e09f961782eba2c06b411dba5deeed167 (patch) | |
| tree | 5bf8b94e031ad0da507e8a651af0534ee2dd9f03 /games | |
| parent | 8d91c10bdcd1876eb94640104e0adf7b3566b385 (diff) | |
| download | ports-a6a8ed7e09f961782eba2c06b411dba5deeed167.tar.gz ports-a6a8ed7e09f961782eba2c06b411dba5deeed167.zip | |
Notes
Diffstat (limited to 'games')
| -rw-r--r-- | games/stepmania-devel/files/patch-tomcrypt_macros.h | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/games/stepmania-devel/files/patch-tomcrypt_macros.h b/games/stepmania-devel/files/patch-tomcrypt_macros.h new file mode 100644 index 000000000000..fe7ee29e9a73 --- /dev/null +++ b/games/stepmania-devel/files/patch-tomcrypt_macros.h @@ -0,0 +1,107 @@ +--- src/libtomcrypt/src/headers/tomcrypt_macros.h.orig 2012-08-06 07:23:37.000000000 +0200 ++++ src/libtomcrypt/src/headers/tomcrypt_macros.h 2015-03-02 21:40:07.785177000 +0100 +@@ -262,21 +262,19 @@ + + #ifndef LTC_NO_ROLC + +-static inline __attribute__((always_inline)) unsigned ROLc(unsigned word, const int i) +-{ +- asm ("roll %2,%0" +- :"=r" (word) +- :"0" (word),"I" (i)); +- return word; +-} +- +-static inline __attribute__((always_inline)) unsigned RORc(unsigned word, const int i) +-{ +- asm ("rorl %2,%0" +- :"=r" (word) +- :"0" (word),"I" (i)); +- return word; +-} ++#define ROLc(word, i) ({ \ ++ unsigned _word = word; \ ++ asm ("roll %2,%0" \ ++ :"=r" (_word) \ ++ :"0" (_word),"I" (i)); \ ++ _word; }) ++ ++#define RORc(word, i) ({ \ ++ unsigned _word = word; \ ++ asm ("rorl %2,%0" \ ++ :"=r" (_word) \ ++ :"0" (_word),"I" (i)); \ ++ _word; }) + + #else + +@@ -305,21 +303,19 @@ + + #ifndef LTC_NO_ROLC + +-static inline __attribute__((always_inline)) unsigned ROLc(unsigned word, const int i) +-{ +- asm ("rotlwi %0,%0,%2" +- :"=r" (word) +- :"0" (word),"I" (i)); +- return word; +-} +- +-static inline __attribute__((always_inline)) unsigned RORc(unsigned word, const int i) +-{ +- asm ("rotrwi %0,%0,%2" +- :"=r" (word) +- :"0" (word),"I" (i)); +- return word; +-} ++#define ROLc(word, i) ({ \ ++ unsigned _word = word; \ ++ asm ("rotlwi %0,%0,%2" \ ++ :"=r" (_word) \ ++ :"0" (_word),"I" (i)); \ ++ _word; }) ++ ++#define RORc(word, i) ({ \ ++ unsigned _word = word; \ ++ asm ("rotrwi %0,%0,%2" \ ++ :"=r" (_word) \ ++ :"0" (_word),"I" (i)); \ ++ _word; }) + + #else + +@@ -361,21 +357,19 @@ + + #ifndef LTC_NO_ROLC + +-static inline __attribute__((always_inline)) unsigned long ROL64c(unsigned long word, const int i) +-{ +- asm("rolq %2,%0" +- :"=r" (word) +- :"0" (word),"J" (i)); +- return word; +-} +- +-static inline __attribute__((always_inline)) unsigned long ROR64c(unsigned long word, const int i) +-{ +- asm("rorq %2,%0" +- :"=r" (word) +- :"0" (word),"J" (i)); +- return word; +-} ++#define ROL64c(word, i) ({ \ ++ unsigned long _word = word; \ ++ asm ("rolq %2,%0" \ ++ :"=r" (_word) \ ++ :"0" (_word),"J" (i)); \ ++ _word; }) ++ ++#define ROR64c(word, i) ({ \ ++ unsigned long _word = word; \ ++ asm ("rorq %2,%0" \ ++ :"=r" (_word) \ ++ :"0" (_word),"J" (i)); \ ++ _word; }) + + #else /* LTC_NO_ROLC */ + |