svn commit: r381678 - head/games/stepmania-devel/files

[Bartek Rutkowski]

Author: robak
Date: Thu Mar 19 19:23:09 2015
New Revision: 381678
URL: https://svnweb.freebsd.org/changeset/ports/381678
QAT: https://qat.redports.org/buildarchive/r381678/

Log:
  games/stepmania-devel: fix clang 3.6 build
  
  PR:		198206
  Submitted by:	Dimitry Andric <dim at FreeBSD.org>

Added:
  head/games/stepmania-devel/files/patch-tomcrypt_macros.h   (contents, props changed)

Added: head/games/stepmania-devel/files/patch-tomcrypt_macros.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/stepmania-devel/files/patch-tomcrypt_macros.h	Thu Mar 19 19:23:09 2015	(r381678)
@@ -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 */
+