From 6774994531fdda794ef69aa88c69cdec4a87ab79 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 3 Nov 2015 12:59:13 +0100
Subject: [PATCH] Don't mix .globl and .global - Pick one, stick to it

---
 .../crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S       | 4 ++--
 .../crypto_scalarmult/curve25519/sandy2x/fe51_pack.S          | 4 ++--
 src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S   | 4 ++--
 .../crypto_scalarmult/curve25519/sandy2x/ladder_base.S        | 4 ++--
 4 files changed, 8 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 0aaed116..518ee00e 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S
+++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S
@@ -5,8 +5,8 @@
 #include "fe51_namespace.h"
 #include "consts_namespace.h"
 .p2align 5
-.global _fe51_nsquare
-.global fe51_nsquare
+.globl _fe51_nsquare
+.globl fe51_nsquare
 _fe51_nsquare:
 fe51_nsquare:
 mov %rsp,%r11
diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S
index 2bb48a68..f848327d 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S
+++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S
@@ -5,8 +5,8 @@
 #include "fe51_namespace.h"
 #include "consts_namespace.h"
 .p2align 5
-.global _fe51_pack
-.global fe51_pack
+.globl _fe51_pack
+.globl fe51_pack
 _fe51_pack:
 fe51_pack:
 mov %rsp,%r11
diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S
index a80b3b3a..c557d174 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S
+++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S
@@ -1,8 +1,8 @@
 #include "ladder_namespace.h"
 #include "consts_namespace.h"
 .p2align 5
-.global _ladder
-.global ladder
+.globl _ladder
+.globl ladder
 _ladder:
 ladder:
 mov %rsp,%r11
diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S
index 74d38ce5..0b575880 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S
+++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S
@@ -1,8 +1,8 @@
 #include "ladder_base_namespace.h"
 #include "consts_namespace.h"
 .p2align 5
-.global _ladder_base
-.global ladder_base
+.globl _ladder_base
+.globl ladder_base
 _ladder_base:
 ladder_base:
 mov %rsp,%r11