From: Francis Booth <boothf@boothlabs.me>
To: wireguard@lists.zx2c4.com
Subject: [PATCH ARM] Compile on Raspberry Pi
Date: Tue, 28 Aug 2018 18:22:00 -0400 [thread overview]
Message-ID: <0f7abb29-d6d3-d211-c174-2748b318182f@boothlabs.me> (raw)
[-- Attachment #1: Type: text/plain, Size: 1736 bytes --]
Attempting to build Wireguard on a Raspberry Pi will result in an
assembly error
Error: immediate expression requires a # prefix -- `moveq r5,1'
(the full build error log can be found here: https://pastebin.com/CKTXwGyG)
Appending # to the values and telling ARM to treat them as literals
solves the issue.
I was able to test this patch out on my own Raspberry Pi 3B+ and can
confirm the resulting build is successfully able to build, create the
wg0 interface, generate a private key, connect to a peer, and send
encrypted messages back and forth.
justw and revel assisted in providing the fix via the Wireguard irc channel.
curve25519: arm: Compile on Raspi
diff --git a/src/crypto/curve25519-arm.S b/src/crypto/curve25519-arm.S
index cb40c24..f9d50e9 100644
--- a/src/crypto/curve25519-arm.S
+++ b/src/crypto/curve25519-arm.S
@@ -1554,35 +1554,35 @@ ENTRY(curve25519_neon)
movw r4, 0
movw r5, 2
cmp r1, #1
- moveq r5, 1
+ moveq r5, #1
addeq r2, r3, #336
addeq r4, r3, #48
cmp r1, #2
- moveq r5, 1
+ moveq r5, #1
addeq r2, r3, #48
cmp r1, #3
- moveq r5, 5
+ moveq r5, #5
addeq r4, r3, #336
cmp r1, #4
- moveq r5, 10
+ moveq r5, #10
cmp r1, #5
- moveq r5, 20
+ moveq r5, #20
cmp r1, #6
- moveq r5, 10
+ moveq r5, #10
addeq r2, r3, #336
addeq r4, r3, #336
cmp r1, #7
- moveq r5, 50
+ moveq r5, #50
cmp r1, #8
- moveq r5, 100
+ moveq r5, #100
cmp r1, #9
- moveq r5, 50
+ moveq r5, #50
addeq r2, r3, #336
cmp r1, #10
- moveq r5, 5
+ moveq r5, #5
addeq r2, r3, #48
cmp r1, #11
- moveq r5, 0
+ moveq r5, #0
addeq r2, r3, #96
add r6, r3, #144
add r7, r3, #288
[-- Attachment #2: Type: text/html, Size: 2414 bytes --]
next reply other threads:[~2018-08-28 22:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 22:22 Francis Booth [this message]
2018-08-29 4:05 ` [PATCH ARM] Compile on Raspberry Pi Jason A. Donenfeld
2018-08-29 7:07 ` Emeka
2018-08-29 10:34 ` logcabin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0f7abb29-d6d3-d211-c174-2748b318182f@boothlabs.me \
--to=boothf@boothlabs.me \
--cc=wireguard@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).