diff options
| author | Russ Cox <rsc@golang.org> | 2017-08-24 19:24:43 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2017-08-26 00:52:42 +0000 |
| commit | a6fa23922582f507975d689ccbbcf4758c85fb30 (patch) | |
| tree | 2e89481a0671f24c4500560894a22dbe66e6fb3b | |
| parent | d5efcb1ead22bffc7c73ad18b2aa8b96099e328b (diff) | |
| download | go-git-a6fa23922582f507975d689ccbbcf4758c85fb30.tar.gz | |
[dev.boringcrypto.go1.8] crypto/internal/boring: clear "executable stack" bit from syso
Change-Id: Ie9dd13f3ae78a423a231f47e746a38f96768b93c
Reviewed-on: https://go-review.googlesource.com/58830
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-on: https://go-review.googlesource.com/58971
Reviewed-by: Adam Langley <agl@golang.org>
| -rwxr-xr-x | src/crypto/internal/boring/build/build.sh | 2 | ||||
| -rwxr-xr-x | src/crypto/internal/boring/build/build_in_chroot.sh | 2 | ||||
| -rw-r--r-- | src/crypto/internal/boring/goboringcrypto_linux_amd64.syso | bin | 7576080 -> 7576080 bytes |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/crypto/internal/boring/build/build.sh b/src/crypto/internal/boring/build/build.sh index 5aa0c051d9..7c50327c2f 100755 --- a/src/crypto/internal/boring/build/build.sh +++ b/src/crypto/internal/boring/build/build.sh @@ -57,7 +57,7 @@ mkdir $chroot/godriver cp ../goboringcrypto.h $chroot/godriver sudo http_proxy=$http_proxy chroot $chroot /root_setup_in_chroot.sh -sudo chroot --userspec=$USER:$USER $chroot /build_in_chroot.sh +sudo chroot --userspec=$(id -u):$(id -g) $chroot /build_in_chroot.sh cp $chroot/godriver/goboringcrypto_linux_amd64.syso .. sha256sum ../goboringcrypto_linux_amd64.syso echo DONE diff --git a/src/crypto/internal/boring/build/build_in_chroot.sh b/src/crypto/internal/boring/build/build_in_chroot.sh index 84ad953ae7..b5e5a778b6 100755 --- a/src/crypto/internal/boring/build/build_in_chroot.sh +++ b/src/crypto/internal/boring/build/build_in_chroot.sh @@ -183,6 +183,8 @@ __umodti3: xorl %ecx, %ecx movl %ecx, 0(%ecx) jmp 1b + +.section .note.GNU-stack,"",@progbits EOF clang-4.0 -c -o umod.o umod.s diff --git a/src/crypto/internal/boring/goboringcrypto_linux_amd64.syso b/src/crypto/internal/boring/goboringcrypto_linux_amd64.syso Binary files differindex b1e56a526a..89c88e9953 100644 --- a/src/crypto/internal/boring/goboringcrypto_linux_amd64.syso +++ b/src/crypto/internal/boring/goboringcrypto_linux_amd64.syso |