From 20eacd0ab74a9eea57881a2fe38aa20352c5e433 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 3 Nov 2015 13:03:28 +0100
Subject: [PATCH] Properly tag function symbols

---
 .../curve25519/sandy2x/fe51_nsquare.S                  | 10 ++++++++--
 .../crypto_scalarmult/curve25519/sandy2x/fe51_pack.S   | 10 ++++++++--
 .../crypto_scalarmult/curve25519/sandy2x/ladder.S      | 10 ++++++++--
 .../crypto_scalarmult/curve25519/sandy2x/ladder_base.S | 10 ++++++++--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S
index 518ee00e..fd79b8f0 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S
+++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S
@@ -5,10 +5,16 @@
 #include "fe51_namespace.h"
 #include "consts_namespace.h"
 .p2align 5
-.globl _fe51_nsquare
+
 .globl fe51_nsquare
-_fe51_nsquare:
+.globl _fe51_nsquare
+#ifdef __ELF__
+.type  fe51_nsquare, @function
+.type _fe51_nsquare, @function
+#endif
 fe51_nsquare:
+_fe51_nsquare:
+
 mov %rsp,%r11
 and $31,%r11
 add $64,%r11
diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S
index f848327d..e652ace8 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S
+++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S
@@ -5,10 +5,16 @@
 #include "fe51_namespace.h"
 #include "consts_namespace.h"
 .p2align 5
-.globl _fe51_pack
+
 .globl fe51_pack
-_fe51_pack:
+.globl _fe51_pack
+#ifdef __ELF__
+.type  fe51_pack, @function
+.type _fe51_pack, @function
+#endif
 fe51_pack:
+_fe51_pack:
+
 mov %rsp,%r11
 and $31,%r11
 add $32,%r11
diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S
index c557d174..1f6978b6 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S
+++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S
@@ -1,10 +1,16 @@
 #include "ladder_namespace.h"
 #include "consts_namespace.h"
 .p2align 5
-.globl _ladder
+
 .globl ladder
-_ladder:
+.globl _ladder
+#ifdef __ELF__
+.type  ladder, @function
+.type _ladder, @function
+#endif
 ladder:
+_ladder:
+
 mov %rsp,%r11
 and $31,%r11
 add $1856,%r11
diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S
index 0b575880..20990ef1 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S
+++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S
@@ -1,10 +1,16 @@
 #include "ladder_base_namespace.h"
 #include "consts_namespace.h"
 .p2align 5
-.globl _ladder_base
+
 .globl ladder_base
-_ladder_base:
+.globl _ladder_base
+#ifdef __ELF__
+.type  ladder_base, @function
+.type _ladder_base, @function
+#endif
 ladder_base:
+_ladder_base:
+
 mov %rsp,%r11
 and $31,%r11
 add $1568,%r11