diff options
author | Austin Clements <austin@google.com> | 2014-10-22 11:21:16 -0400 |
---|---|---|
committer | Austin Clements <austin@google.com> | 2014-10-22 11:21:16 -0400 |
commit | 2c586384223e980fd3303625ea6b02ed5d9fb9c0 (patch) | |
tree | 54aa72cd9d5eb1566f682d3b0770141a11b54fc2 /src/pkg/crypto/rc4 | |
parent | ebe8a09fb603d9510cb982a6c11a3e1638f7f8fb (diff) | |
parent | 45fcda1dc8d9b4d4a9b642faf8e78941873f508d (diff) | |
download | go-2c586384223e980fd3303625ea6b02ed5d9fb9c0.tar.gz |
[dev.power64] build: merge default into dev.power64
LGTM=rsc
R=rsc
CC=golang-codereviews
https://codereview.appspot.com/160200044
Diffstat (limited to 'src/pkg/crypto/rc4')
-rw-r--r-- | src/pkg/crypto/rc4/rc4_386.s | 2 | ||||
-rw-r--r-- | src/pkg/crypto/rc4/rc4_amd64.s | 2 | ||||
-rw-r--r-- | src/pkg/crypto/rc4/rc4_amd64p32.s | 2 | ||||
-rw-r--r-- | src/pkg/crypto/rc4/rc4_arm.s | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/pkg/crypto/rc4/rc4_386.s b/src/pkg/crypto/rc4/rc4_386.s index b04fc1fb8..54221036b 100644 --- a/src/pkg/crypto/rc4/rc4_386.s +++ b/src/pkg/crypto/rc4/rc4_386.s @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -#include "../../../cmd/ld/textflag.h" +#include "textflag.h" // func xorKeyStream(dst, src *byte, n int, state *[256]byte, i, j *uint8) TEXT ·xorKeyStream(SB),NOSPLIT,$0 diff --git a/src/pkg/crypto/rc4/rc4_amd64.s b/src/pkg/crypto/rc4/rc4_amd64.s index e3234b6c7..57d941c8f 100644 --- a/src/pkg/crypto/rc4/rc4_amd64.s +++ b/src/pkg/crypto/rc4/rc4_amd64.s @@ -2,7 +2,7 @@ // http://www.zorinaq.com/papers/rc4-amd64.html // http://www.zorinaq.com/papers/rc4-amd64.tar.bz2 -#include "../../../cmd/ld/textflag.h" +#include "textflag.h" // Local modifications: // diff --git a/src/pkg/crypto/rc4/rc4_amd64p32.s b/src/pkg/crypto/rc4/rc4_amd64p32.s index 27d849507..970b34e08 100644 --- a/src/pkg/crypto/rc4/rc4_amd64p32.s +++ b/src/pkg/crypto/rc4/rc4_amd64p32.s @@ -2,7 +2,7 @@ // http://www.zorinaq.com/papers/rc4-amd64.html // http://www.zorinaq.com/papers/rc4-amd64.tar.bz2 -#include "../../../cmd/ld/textflag.h" +#include "textflag.h" // Local modifications: // diff --git a/src/pkg/crypto/rc4/rc4_arm.s b/src/pkg/crypto/rc4/rc4_arm.s index b9ac72301..51be3bf95 100644 --- a/src/pkg/crypto/rc4/rc4_arm.s +++ b/src/pkg/crypto/rc4/rc4_arm.s @@ -4,7 +4,7 @@ // +build !nacl -#include "../../../cmd/ld/textflag.h" +#include "textflag.h" // Registers dst = 0 |