View | Details | Raw Unified | Return to bug 190848
Collapse All | Expand All

(-)security/libgcrypt/Makefile (-3 lines)
Lines 33-41 Link Here
33
.if ${ARCH} == "powerpc"
33
.if ${ARCH} == "powerpc"
34
CONFIGURE_ARGS+=	--disable-asm
34
CONFIGURE_ARGS+=	--disable-asm
35
35
36
.elif ${ARCH} == "armv6"
37
USE_GCC=	any
38
39
.elif ${ARCH} == "i386"
36
.elif ${ARCH} == "i386"
40
.if (${OSVERSION} < 900033)
37
.if (${OSVERSION} < 900033)
41
CONFIGURE_ARGS+=	--disable-aesni-support
38
CONFIGURE_ARGS+=	--disable-aesni-support
(-)security/libgcrypt/files/patch-mpi-longlong.h (-2 / +39 lines)
Lines 1-5 Link Here
1
--- ./mpi/longlong.h.orig	2010-02-22 19:04:43.000000000 +0900
1
--- ./mpi/longlong.h.orig	2013-07-25 09:10:04.000000000 +0000
2
+++ ./mpi/longlong.h	2010-11-01 18:25:34.000000000 +0900
2
+++ ./mpi/longlong.h	2014-06-09 18:53:59.000000000 +0000
3
@@ -188,8 +188,8 @@
4
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
5
   __asm__ ("adds %1, %4, %5\n"                                          \
6
 	   "adc  %0, %2, %3"                                            \
7
-	   : "=r" ((USItype)(sh)),                                      \
8
-	     "=&r" ((USItype)(sl))                                      \
9
+	   : "=r" ((sh)),                                               \
10
+	     "=&r" ((sl))                                               \
11
 	   : "%r" ((USItype)(ah)),                                      \
12
 	     "rI" ((USItype)(bh)),                                      \
13
 	     "%r" ((USItype)(al)),                                      \
14
@@ -197,8 +197,8 @@
15
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
16
   __asm__ ("subs %1, %4, %5\n"                                          \
17
 	   "sbc  %0, %2, %3"                                            \
18
-	   : "=r" ((USItype)(sh)),                                      \
19
-	     "=&r" ((USItype)(sl))                                      \
20
+	   : "=r" ((sh)),                                               \
21
+	     "=&r" ((sl))                                               \
22
 	   : "r" ((USItype)(ah)),                                       \
23
 	     "rI" ((USItype)(bh)),                                      \
24
 	     "r" ((USItype)(al)),                                       \
25
@@ -225,10 +225,10 @@
26
 	   : "r0", "r1", "r2")
27
 #else
28
 #define umul_ppmm(xh, xl, a, b)                                         \
29
-  __asm__ ("%@ Inlined umul_ppmm\n"                                     \
30
-	   "umull %r1, %r0, %r2, %r3"                                   \
31
-		   : "=&r" ((USItype)(xh)),                             \
32
-		     "=r" ((USItype)(xl))                               \
33
+  __asm__ (                                                             \
34
+	   "umull %1, %0, %2, %3"                                       \
35
+		   : "=&r" ((xh)),                                      \
36
+		     "=r" ((xl))                                        \
37
 		   : "r" ((USItype)(a)),                                \
38
 		     "r" ((USItype)(b))                                 \
39
 		   : "r0", "r1")
3
@@ -437,8 +437,8 @@
40
@@ -437,8 +437,8 @@
4
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
41
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
5
   __asm__ ("addl %5,%1\n"                                               \
42
   __asm__ ("addl %5,%1\n"                                               \

Return to bug 190848