X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/62f2fee052489167d8d6ffba7ebe510642397ffa..b6db7329f48efc92b80750e6526e903f7c7c545b:/target/linux/octeon/patches/001-handle_removal_h_constraint.patch

diff --git a/target/linux/octeon/patches/001-handle_removal_h_constraint.patch b/target/linux/octeon/patches/001-handle_removal_h_constraint.patch
new file mode 100644
index 000000000..b37b4a757
--- /dev/null
+++ b/target/linux/octeon/patches/001-handle_removal_h_constraint.patch
@@ -0,0 +1,43 @@
+This is an incomplete proof of concept that I applied to be able to
+build a 64 bit kernel with GCC-4.4.  It doesn't handle the 32 bit case
+or the R4000_WAR case.
+
+Comments welcome.
+
+Signed-off-by: David Daney <ddaney@caviumnetworks.com>
+---
+ arch/mips/include/asm/compiler.h |    7 +++++++
+ arch/mips/include/asm/delay.h    |    4 ++++
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/include/asm/compiler.h
++++ b/arch/mips/include/asm/compiler.h
+@@ -16,4 +16,11 @@
+ #define GCC_REG_ACCUM "accum"
+ #endif
+ 
++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
++#define GCC_NO_H_CONSTRAINT
++#ifdef CONFIG_64BIT
++typedef unsigned int uint128_t __attribute__((mode(TI)));
++#endif
++#endif
++
+ #endif /* _ASM_COMPILER_H */
+--- a/arch/mips/include/asm/delay.h
++++ b/arch/mips/include/asm/delay.h
+@@ -83,10 +83,14 @@ static inline void __udelay(unsigned lon
+ 		: "r" (usecs), "r" (lpj)
+ 		: GCC_REG_ACCUM);
+ 	else if (sizeof(long) == 8 && !R4000_WAR)
++#ifdef GCC_NO_H_CONSTRAINT
++		usecs = ((uint128_t)usecs * lpj) >> 64;
++#else
+ 		__asm__("dmultu\t%2, %3"
+ 		: "=h" (usecs), "=l" (lo)
+ 		: "r" (usecs), "r" (lpj)
+ 		: GCC_REG_ACCUM);
++#endif
+ 	else if (sizeof(long) == 8 && R4000_WAR)
+ 		__asm__("dmultu\t%3, %4\n\tmfhi\t%0"
+ 		: "=r" (usecs), "=h" (hi), "=l" (lo)