summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-11-06 16:19:30 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:21:20 +0000
commit813718c2ea54eb763ae6b525408436dab6b7816d (patch)
tree05c602cc07fa36b7fc96ba0e0834812cdcc5aa31
parentddc5abec96b48a370fc14ac7624e7ab74e55537f (diff)
downloadpoky-813718c2ea54eb763ae6b525408436dab6b7816d.tar.gz
libgcrypt: Ugrade to 1.6.2
Remove backported patch (From OE-Core rev: a1ebad9242eb3c94505383c4558e4d9476298c5d) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch169
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb6
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb4
3 files changed, 4 insertions, 175 deletions
diff --git a/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch b/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch
deleted file mode 100644
index 340087279d..0000000000
--- a/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch
+++ /dev/null
@@ -1,169 +0,0 @@
1Fix ARM assembly when building __PIC__
2
3* cipher/camellia-arm.S (GET_DATA_POINTER): New.
4(_gcry_camellia_arm_encrypt_block): Use GET_DATA_POINTER.
5(_gcry_camellia_arm_decrypt_block): Ditto.
6* cipher/cast5-arm.S (GET_DATA_POINTER): New.
7(_gcry_cast5_arm_encrypt_block, _gcry_cast5_arm_decrypt_block)
8(_gcry_cast5_arm_enc_blk2, _gcry_cast5_arm_dec_blk2): Use
9GET_DATA_POINTER.
10* cipher/rijndael-arm.S (GET_DATA_POINTER): New.
11(_gcry_aes_arm_encrypt_block, _gcry_aes_arm_decrypt_block): Use
12GET_DATA_POINTER.
13--
14
15Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
16
17Upstream-Status: Backport
18
19Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
20---
21 cipher/camellia-arm.S | 17 +++++++++++++++--
22 cipher/cast5-arm.S | 21 +++++++++++++++++----
23 cipher/rijndael-arm.S | 17 +++++++++++++++--
24 3 files changed, 47 insertions(+), 8 deletions(-)
25
26diff --git a/cipher/camellia-arm.S b/cipher/camellia-arm.S
27index c30d194..cdeaf8b 100644
28--- a/cipher/camellia-arm.S
29+++ b/cipher/camellia-arm.S
30@@ -28,6 +28,19 @@
31 .syntax unified
32 .arm
33
34+#ifdef __PIC__
35+# define GET_DATA_POINTER(reg, name, rtmp) \
36+ ldr reg, 1f; \
37+ ldr rtmp, 2f; \
38+ b 3f; \
39+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \
40+ 2: .word name(GOT); \
41+ 3: add reg, pc, reg; \
42+ ldr reg, [reg, rtmp];
43+#else
44+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name
45+#endif
46+
47 /* struct camellia_ctx: */
48 #define key_table 0
49
50@@ -261,7 +274,7 @@ _gcry_camellia_arm_encrypt_block:
51 */
52 push {%r1, %r4-%r11, %ip, %lr};
53
54- ldr RTAB1, =.Lcamellia_sp1110;
55+ GET_DATA_POINTER(RTAB1, .Lcamellia_sp1110, RTAB3);
56 mov RMASK, #0xff;
57 add RTAB3, RTAB1, #(2 * 4);
58 push {%r3};
59@@ -309,7 +322,7 @@ _gcry_camellia_arm_decrypt_block:
60 */
61 push {%r1, %r4-%r11, %ip, %lr};
62
63- ldr RTAB1, =.Lcamellia_sp1110;
64+ GET_DATA_POINTER(RTAB1, .Lcamellia_sp1110, RTAB3);
65 mov RMASK, #0xff;
66 add RTAB3, RTAB1, #(2 * 4);
67 mov RMASK, RMASK, lsl#4 /* byte mask */
68diff --git a/cipher/cast5-arm.S b/cipher/cast5-arm.S
69index ce7fa93..db96db4 100644
70--- a/cipher/cast5-arm.S
71+++ b/cipher/cast5-arm.S
72@@ -30,6 +30,19 @@
73
74 .extern _gcry_cast5_s1to4;
75
76+#ifdef __PIC__
77+# define GET_DATA_POINTER(reg, name, rtmp) \
78+ ldr reg, 1f; \
79+ ldr rtmp, 2f; \
80+ b 3f; \
81+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \
82+ 2: .word name(GOT); \
83+ 3: add reg, pc, reg; \
84+ ldr reg, [reg, rtmp];
85+#else
86+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name
87+#endif
88+
89 /* structure of crypto context */
90 #define Km 0
91 #define Kr (Km + (16 * 4))
92@@ -260,7 +273,7 @@ _gcry_cast5_arm_encrypt_block:
93 */
94 push {%r1, %r4-%r11, %ip, %lr};
95
96- ldr Rs1, =_gcry_cast5_s1to4;
97+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2);
98 mov RMASK, #(0xff << 2);
99 add Rs2, Rs1, #(0x100*4);
100 add Rs3, Rs1, #(0x100*4*2);
101@@ -306,7 +319,7 @@ _gcry_cast5_arm_decrypt_block:
102 */
103 push {%r1, %r4-%r11, %ip, %lr};
104
105- ldr Rs1, =_gcry_cast5_s1to4;
106+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2);
107 mov RMASK, #(0xff << 2);
108 add Rs2, Rs1, #(0x100 * 4);
109 add Rs3, Rs1, #(0x100 * 4 * 2);
110@@ -500,7 +513,7 @@ _gcry_cast5_arm_enc_blk2:
111 */
112 push {%lr};
113
114- ldr Rs1, =_gcry_cast5_s1to4;
115+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2);
116 mov RMASK, #(0xff << 2);
117 add Rs2, Rs1, #(0x100 * 4);
118
119@@ -631,7 +644,7 @@ _gcry_cast5_arm_dec_blk2:
120 * [RR0, RL0], [RR1, RL1]: dst
121 */
122
123- ldr Rs1, =_gcry_cast5_s1to4;
124+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2);
125 mov RMASK, #(0xff << 2);
126 add Rs2, Rs1, #(0x100 * 4);
127
128diff --git a/cipher/rijndael-arm.S b/cipher/rijndael-arm.S
129index 22c350c..421c3b4 100644
130--- a/cipher/rijndael-arm.S
131+++ b/cipher/rijndael-arm.S
132@@ -28,6 +28,19 @@
133 .syntax unified
134 .arm
135
136+#ifdef __PIC__
137+# define GET_DATA_POINTER(reg, name, rtmp) \
138+ ldr reg, 1f; \
139+ ldr rtmp, 2f; \
140+ b 3f; \
141+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \
142+ 2: .word name(GOT); \
143+ 3: add reg, pc, reg; \
144+ ldr reg, [reg, rtmp];
145+#else
146+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name
147+#endif
148+
149 /* register macros */
150 #define CTX %r0
151 #define RTAB %lr
152@@ -249,7 +262,7 @@ _gcry_aes_arm_encrypt_block:
153 2:
154 sub %sp, #16;
155
156- ldr RTAB, =.LtableE0;
157+ GET_DATA_POINTER(RTAB, .LtableE0, RMASK);
158
159 str %r1, [%sp, #4]; /* dst */
160 mov RMASK, #0xff;
161@@ -503,7 +516,7 @@ _gcry_aes_arm_decrypt_block:
162 2:
163 sub %sp, #16;
164
165- ldr RTAB, =.LtableD0;
166+ GET_DATA_POINTER(RTAB, .LtableD0, RMASK);
167
168 mov RMASK, #0xff;
169 str %r1, [%sp, #4]; /* dst */
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb
deleted file mode 100644
index 903ed661ed..0000000000
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require libgcrypt.inc
2
3SRC_URI += "file://libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch"
4
5SRC_URI[md5sum] = "d155aa1b06fa879175922ba28f6a6509"
6SRC_URI[sha256sum] = "7c1007197bef49c3b8740cf6af8b4eb4eb74c7a69796ebcf555d928c287255de"
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
new file mode 100644
index 0000000000..c49c0e7c17
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
@@ -0,0 +1,4 @@
1require libgcrypt.inc
2
3SRC_URI[md5sum] = "d19adc062edff0ebc7e887212733ef1f"
4SRC_URI[sha256sum] = "936921644b9c81e2395e18a554a9a5f9252aae3976f8afc3e4229ee9d785e627"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-10 14:16:31 +0000