[PATCH] bitops: alpha: use config options instead of __alpha_fix__ and __alpha_cix__
Use config options instead of gcc builtin definition to tell the use of instruction set extensions (CIX and FIX). This is introduced to tell the kbuild system the use of opmized hweight*() routines on alpha architecture. Signed-off-by: Akinobu Mita <mita@miraclelinux.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
20548664aa
commit
4b417d0c7c
@@ -84,7 +84,7 @@ $last_quad:
|
||||
beq $2, $not_found # U : U L U L
|
||||
|
||||
$found_it:
|
||||
#if defined(__alpha_fix__) && defined(__alpha_cix__)
|
||||
#ifdef CONFIG_ALPHA_EV67
|
||||
/*
|
||||
* Since we are guaranteed to have set one of the bits, we don't
|
||||
* have to worry about coming back with a 0x40 out of cttz...
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* (C) Copyright 1998 Linus Torvalds
|
||||
*/
|
||||
|
||||
#if defined(__alpha_cix__) || defined(__alpha_fix__)
|
||||
#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
|
||||
#define STT(reg,val) asm volatile ("ftoit $f"#reg",%0" : "=r"(val));
|
||||
#else
|
||||
#define STT(reg,val) asm volatile ("stt $f"#reg",%0" : "=m"(val));
|
||||
@@ -53,7 +53,7 @@ alpha_read_fp_reg (unsigned long reg)
|
||||
return val;
|
||||
}
|
||||
|
||||
#if defined(__alpha_cix__) || defined(__alpha_fix__)
|
||||
#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
|
||||
#define LDT(reg,val) asm volatile ("itoft %0,$f"#reg : : "r"(val));
|
||||
#else
|
||||
#define LDT(reg,val) asm volatile ("ldt $f"#reg",%0" : : "m"(val));
|
||||
@@ -98,7 +98,7 @@ alpha_write_fp_reg (unsigned long reg, unsigned long val)
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(__alpha_cix__) || defined(__alpha_fix__)
|
||||
#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
|
||||
#define STS(reg,val) asm volatile ("ftois $f"#reg",%0" : "=r"(val));
|
||||
#else
|
||||
#define STS(reg,val) asm volatile ("sts $f"#reg",%0" : "=m"(val));
|
||||
@@ -147,7 +147,7 @@ alpha_read_fp_reg_s (unsigned long reg)
|
||||
return val;
|
||||
}
|
||||
|
||||
#if defined(__alpha_cix__) || defined(__alpha_fix__)
|
||||
#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
|
||||
#define LDS(reg,val) asm volatile ("itofs %0,$f"#reg : : "r"(val));
|
||||
#else
|
||||
#define LDS(reg,val) asm volatile ("lds $f"#reg",%0" : : "m"(val));
|
||||
|
||||
Reference in New Issue
Block a user