Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88ed39b0 authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Linus Torvalds
Browse files

alpha: build fixes - force architecture 



Override compiler .arch directive for generic kernel build.

Signed-off-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7fc1a1ab

arch/alpha/kernel/sys_titan.c

+1 −2
Original line number Diff line number Diff line
@@ -257,8 +257,7 @@ titan_dispatch_irqs(u64 mask) 
	 */

	while (mask) {

		/* convert to SRM vector... priority is <63> -> <0> */

		__asm__("ctlz %1, %0" : "=r"(vector) : "r"(mask));

		vector = 63 - vector;

		vector = 63 - __kernel_ctlz(mask);

		mask &= ~(1UL << vector);	/* clear it out 	 */

		vector = 0x900 + (vector << 4);	/* convert to SRM vector */

include/asm-alpha/compiler.h

+35 −12
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
# define __kernel_extbl(val, shift)	__builtin_alpha_extbl(val, shift)

# define __kernel_extwl(val, shift)	__builtin_alpha_extwl(val, shift)

# define __kernel_cmpbge(a, b)		__builtin_alpha_cmpbge(a, b)

# define __kernel_cttz(x)		__builtin_ctzl(x)

# define __kernel_ctlz(x)		__builtin_clzl(x)

# define __kernel_ctpop(x)		__builtin_popcountl(x)

#else

# define __kernel_insbl(val, shift)					\

  ({ unsigned long __kir;						\
@@ -49,6 +46,14 @@ 
  ({ unsigned long __kir;						\

     __asm__("cmpbge %r2,%1,%0" : "=r"(__kir) : "rI"(b), "rJ"(a));	\

     __kir; })

#endif



#ifdef __alpha_cix__

# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 || __GNUC__ > 3

#  define __kernel_cttz(x)		__builtin_ctzl(x)

#  define __kernel_ctlz(x)		__builtin_clzl(x)

#  define __kernel_ctpop(x)		__builtin_popcountl(x)

# else

#  define __kernel_cttz(x)						\

   ({ unsigned long __kir;						\

      __asm__("cttz %1,%0" : "=r"(__kir) : "r"(x));			\
@@ -62,6 +67,20 @@ 
      __asm__("ctpop %1,%0" : "=r"(__kir) : "r"(x));			\

      __kir; })

# endif

#else

# define __kernel_cttz(x)						\

  ({ unsigned long __kir;						\

     __asm__(".arch ev67; cttz %1,%0" : "=r"(__kir) : "r"(x));		\

     __kir; })

# define __kernel_ctlz(x)						\

  ({ unsigned long __kir;						\

     __asm__(".arch ev67; ctlz %1,%0" : "=r"(__kir) : "r"(x));		\

     __kir; })

# define __kernel_ctpop(x)						\

  ({ unsigned long __kir;						\

     __asm__(".arch ev67; ctpop %1,%0" : "=r"(__kir) : "r"(x));		\

     __kir; })

#endif





/*
@@ -78,16 +97,20 @@ 
#else

#define __kernel_ldbu(mem)				\

  ({ unsigned char __kir;				\

     __asm__("ldbu %0,%1" : "=r"(__kir) : "m"(mem));	\

     __asm__(".arch ev56;				\

	      ldbu %0,%1" : "=r"(__kir) : "m"(mem));	\

     __kir; })

#define __kernel_ldwu(mem)				\

  ({ unsigned short __kir;				\

     __asm__("ldwu %0,%1" : "=r"(__kir) : "m"(mem));	\

     __asm__(".arch ev56;				\

	      ldwu %0,%1" : "=r"(__kir) : "m"(mem));	\

     __kir; })

#define __kernel_stb(val,mem)				\

  __asm__("stb %1,%0" : "=m"(mem) : "r"(val))

  __asm__(".arch ev56;					\

	   stb %1,%0" : "=m"(mem) : "r"(val))

#define __kernel_stw(val,mem)				\

  __asm__("stw %1,%0" : "=m"(mem) : "r"(val))

  __asm__(".arch ev56;					\

	   stw %1,%0" : "=m"(mem) : "r"(val))

#endif



#ifdef __KERNEL__