ciborium

Merge lp:~mwhudson/ciborium/arm64-buildability into lp:ciborium

  1. arm64-buildability
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 157
Merged at revision: 157
Proposed branch: lp:~mwhudson/ciborium/arm64-buildability
Merge into: lp:ciborium
Diff against target: 22 lines (+18/-0)
1 file modified
qml.v1/cdata/cdata14_arm64.s (+18/-0)
To merge this branch: bzr merge lp:~mwhudson/ciborium/arm64-buildability
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+297313@code.launchpad.net

Commit message

Make ciborium building on arm64.

Description of the change

The fix I posted to the bug report.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looks good, makes things build correctly! And that's good enough for us right now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'qml.v1/cdata/cdata14_arm64.s'
2--- qml.v1/cdata/cdata14_arm64.s 1970-01-01 00:00:00 +0000
3+++ qml.v1/cdata/cdata14_arm64.s 2016-06-14 10:25:45 +0000
4@@ -0,0 +1,18 @@
5+// +build go1.4
6+
7+#include "textflag.h"
8+
9+TEXT ·Ref(SB),NOSPLIT,$8-8
10+ BL runtime·acquirem(SB)
11+ MOVD 8(RSP), R0
12+ MOVD R0, ret+0(FP)
13+ MOVD R0, 8(RSP)
14+ BL runtime·releasem(SB)
15+ RET
16+
17+TEXT ·Addrs(SB),NOSPLIT,$0-16
18+ MOVD $runtime·main(SB), R0
19+ MOVD R0, ret+0(FP)
20+ MOVD $runtime·main_main(SB), R0
21+ MOVD R0, ret+8(FP)
22+ RET

Subscribers

People subscribed via source and target branches