diff --git a/crypto/chacha/chacha_vec_arm.S b/crypto/chacha/chacha_vec_arm.S
index 0f826279..e1ec46ef 100644
--- a/crypto/chacha/chacha_vec_arm.S
+++ b/crypto/chacha/chacha_vec_arm.S
@@ -20,7 +20,7 @@
 # This file was generated by chacha_vec_arm_generate.go using the following
 # compiler command:
 #
-#     /opt/gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc -O3 -mcpu=cortex-a8 -mfpu=neon -fpic -DASM_GEN -I ../../include -S chacha_vec.c -o -
+#     /opt/gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc -O3 -mcpu=cortex-a8 -mfpu=neon -fpic -ffunction-sections -DASM_GEN -I ../../include -S chacha_vec.c -o -
 
 #if !defined(OPENSSL_NO_ASM)
 #if defined(__arm__) || defined(__aarch64__)
@@ -52,7 +52,7 @@
 	.eabi_attribute 18, 4
 	.thumb
 	.file	"chacha_vec.c"
-	.text
+	.section	.text.CRYPTO_chacha_20_neon,"ax",%progbits
 	.align	2
 	.global	CRYPTO_chacha_20_neon
 	.hidden	CRYPTO_chacha_20_neon
diff --git a/crypto/chacha/chacha_vec_arm_generate.go b/crypto/chacha/chacha_vec_arm_generate.go
index 6d167b9a..1e185e57 100644
--- a/crypto/chacha/chacha_vec_arm_generate.go
+++ b/crypto/chacha/chacha_vec_arm_generate.go
@@ -36,6 +36,7 @@ func main() {
 		"-mcpu=cortex-a8",
 		"-mfpu=neon",
 		"-fpic",
+		"-ffunction-sections",
 		"-DASM_GEN",
 		"-I", "../../include",
 		"-S", "chacha_vec.c",