[dev.boringcrypto] 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>

diff --git a/src/crypto/internal/boring/build/build.sh b/src/crypto/internal/boring/build/build.sh
index 5aa0c051d907d4a88db91a979861916180d8299f..7c50327c2f7414b28644133e9bc686fe146b4d2b 100755 (executable)
--- 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 84ad953ae7b97cc9218e92b759fb0d8cad1e2212..b5e5a778b6d8f0a4744ae373989bcc6a6322d892 100755 (executable)
--- 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
index b1e56a526a751b9720ade2a6c2261f771cba46c6..89c88e9953a7aec441ddba47afc79866b1e5c0ca 100644 (file)
Binary files a/src/crypto/internal/boring/goboringcrypto_linux_amd64.syso and b/src/crypto/internal/boring/goboringcrypto_linux_amd64.syso differ