[PATCH] Change .global to .globl in assembly files

Jussi Kivilinna jussi.kivilinna at iki.fi
Mon Oct 28 08:10:06 CET 2013


* cipher/blowfish-arm.S: Change '.global' to '.globl'.
* cipher/camellia-aesni-avx-amd64.S: Ditto.
* cipher/camellia-aesni-avx2-amd64.S: Ditto.
* cipher/camellia-arm.S: Ditto.
* cipher/cast5-amd64.S: Ditto.
* cipher/rijndael-amd64.S: Ditto.
* cipher/rijndael-arm.S: Ditto.
* cipher/serpent-avx2-amd64.S: Ditto.
* cipher/serpent-sse2-amd64.S: Ditto.
* cipher/twofish-amd64.S: Ditto.
* cipher/twofish-arm.S: Ditto.
--

The .global keyword is used only in newer versions of GAS, so change these to
older .globl for better portability.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
---
 cipher/blowfish-arm.S              |    4 ++--
 cipher/camellia-aesni-avx-amd64.S  |    6 +++---
 cipher/camellia-aesni-avx2-amd64.S |    6 +++---
 cipher/camellia-arm.S              |    4 ++--
 cipher/cast5-amd64.S               |   10 +++++-----
 cipher/rijndael-amd64.S            |    4 ++--
 cipher/rijndael-arm.S              |    4 ++--
 cipher/serpent-avx2-amd64.S        |    6 +++---
 cipher/serpent-sse2-amd64.S        |    6 +++---
 cipher/twofish-amd64.S             |   10 +++++-----
 cipher/twofish-arm.S               |    4 ++--
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/cipher/blowfish-arm.S b/cipher/blowfish-arm.S
index 43090d7..901d0c3 100644
--- a/cipher/blowfish-arm.S
+++ b/cipher/blowfish-arm.S
@@ -296,7 +296,7 @@ _gcry_blowfish_arm_do_encrypt:
 .size _gcry_blowfish_arm_do_encrypt,.-_gcry_blowfish_arm_do_encrypt;
 
 .align 3
-.global _gcry_blowfish_arm_encrypt_block
+.globl _gcry_blowfish_arm_encrypt_block
 .type   _gcry_blowfish_arm_encrypt_block,%function;
 
 _gcry_blowfish_arm_encrypt_block:
@@ -317,7 +317,7 @@ _gcry_blowfish_arm_encrypt_block:
 .size _gcry_blowfish_arm_encrypt_block,.-_gcry_blowfish_arm_encrypt_block;
 
 .align 3
-.global _gcry_blowfish_arm_decrypt_block
+.globl _gcry_blowfish_arm_decrypt_block
 .type   _gcry_blowfish_arm_decrypt_block,%function;
 
 _gcry_blowfish_arm_decrypt_block:
diff --git a/cipher/camellia-aesni-avx-amd64.S b/cipher/camellia-aesni-avx-amd64.S
index 9873d98..9be5d14 100644
--- a/cipher/camellia-aesni-avx-amd64.S
+++ b/cipher/camellia-aesni-avx-amd64.S
@@ -947,7 +947,7 @@ __camellia_dec_blk16:
 	vpsubq tmp, x, x;
 
 .align 8
-.global _gcry_camellia_aesni_avx_ctr_enc
+.globl _gcry_camellia_aesni_avx_ctr_enc
 .type   _gcry_camellia_aesni_avx_ctr_enc, at function;
 
 _gcry_camellia_aesni_avx_ctr_enc:
@@ -1062,7 +1062,7 @@ _gcry_camellia_aesni_avx_ctr_enc:
 .size _gcry_camellia_aesni_avx_ctr_enc,.-_gcry_camellia_aesni_avx_ctr_enc;
 
 .align 8
-.global _gcry_camellia_aesni_avx_cbc_dec
+.globl _gcry_camellia_aesni_avx_cbc_dec
 .type   _gcry_camellia_aesni_avx_cbc_dec, at function;
 
 _gcry_camellia_aesni_avx_cbc_dec:
@@ -1126,7 +1126,7 @@ _gcry_camellia_aesni_avx_cbc_dec:
 .size _gcry_camellia_aesni_avx_cbc_dec,.-_gcry_camellia_aesni_avx_cbc_dec;
 
 .align 8
-.global _gcry_camellia_aesni_avx_cfb_dec
+.globl _gcry_camellia_aesni_avx_cfb_dec
 .type   _gcry_camellia_aesni_avx_cfb_dec, at function;
 
 _gcry_camellia_aesni_avx_cfb_dec:
diff --git a/cipher/camellia-aesni-avx2-amd64.S b/cipher/camellia-aesni-avx2-amd64.S
index 7e31323..f0a4fd8 100644
--- a/cipher/camellia-aesni-avx2-amd64.S
+++ b/cipher/camellia-aesni-avx2-amd64.S
@@ -926,7 +926,7 @@ __camellia_dec_blk32:
 	vpsubq tmp, x, x;
 
 .align 8
-.global _gcry_camellia_aesni_avx2_ctr_enc
+.globl _gcry_camellia_aesni_avx2_ctr_enc
 .type   _gcry_camellia_aesni_avx2_ctr_enc, at function;
 
 _gcry_camellia_aesni_avx2_ctr_enc:
@@ -1110,7 +1110,7 @@ _gcry_camellia_aesni_avx2_ctr_enc:
 .size _gcry_camellia_aesni_avx2_ctr_enc,.-_gcry_camellia_aesni_avx2_ctr_enc;
 
 .align 8
-.global _gcry_camellia_aesni_avx2_cbc_dec
+.globl _gcry_camellia_aesni_avx2_cbc_dec
 .type   _gcry_camellia_aesni_avx2_cbc_dec, at function;
 
 _gcry_camellia_aesni_avx2_cbc_dec:
@@ -1181,7 +1181,7 @@ _gcry_camellia_aesni_avx2_cbc_dec:
 .size _gcry_camellia_aesni_avx2_cbc_dec,.-_gcry_camellia_aesni_avx2_cbc_dec;
 
 .align 8
-.global _gcry_camellia_aesni_avx2_cfb_dec
+.globl _gcry_camellia_aesni_avx2_cfb_dec
 .type   _gcry_camellia_aesni_avx2_cfb_dec, at function;
 
 _gcry_camellia_aesni_avx2_cfb_dec:
diff --git a/cipher/camellia-arm.S b/cipher/camellia-arm.S
index 820c46e..302f436 100644
--- a/cipher/camellia-arm.S
+++ b/cipher/camellia-arm.S
@@ -252,7 +252,7 @@
 	str_output_be(%r1, YL, YR, XL, XR, RT0, RT1);
 
 .align 3
-.global _gcry_camellia_arm_encrypt_block
+.globl _gcry_camellia_arm_encrypt_block
 .type   _gcry_camellia_arm_encrypt_block,%function;
 
 _gcry_camellia_arm_encrypt_block:
@@ -300,7 +300,7 @@ _gcry_camellia_arm_encrypt_block:
 .size _gcry_camellia_arm_encrypt_block,.-_gcry_camellia_arm_encrypt_block;
 
 .align 3
-.global _gcry_camellia_arm_decrypt_block
+.globl _gcry_camellia_arm_decrypt_block
 .type   _gcry_camellia_arm_decrypt_block,%function;
 
 _gcry_camellia_arm_decrypt_block:
diff --git a/cipher/cast5-amd64.S b/cipher/cast5-amd64.S
index 1bca249..c3b819d 100644
--- a/cipher/cast5-amd64.S
+++ b/cipher/cast5-amd64.S
@@ -179,7 +179,7 @@
 	movq RLR0, 		(RIO);
 
 .align 8
-.global _gcry_cast5_amd64_encrypt_block
+.globl _gcry_cast5_amd64_encrypt_block
 .type   _gcry_cast5_amd64_encrypt_block, at function;
 
 _gcry_cast5_amd64_encrypt_block:
@@ -219,7 +219,7 @@ _gcry_cast5_amd64_encrypt_block:
 .size _gcry_cast5_amd64_encrypt_block,.-_gcry_cast5_amd64_encrypt_block;
 
 .align 8
-.global _gcry_cast5_amd64_decrypt_block
+.globl _gcry_cast5_amd64_decrypt_block
 .type   _gcry_cast5_amd64_decrypt_block, at function;
 
 _gcry_cast5_amd64_decrypt_block:
@@ -417,7 +417,7 @@ __cast5_dec_blk4:
 .size __cast5_dec_blk4,.-__cast5_dec_blk4;
 
 .align 8
-.global _gcry_cast5_amd64_ctr_enc
+.globl _gcry_cast5_amd64_ctr_enc
 .type   _gcry_cast5_amd64_ctr_enc, at function;
 _gcry_cast5_amd64_ctr_enc:
 	/* input:
@@ -475,7 +475,7 @@ _gcry_cast5_amd64_ctr_enc:
 .size _gcry_cast5_amd64_ctr_enc,.-_gcry_cast5_amd64_ctr_enc;
 
 .align 8
-.global _gcry_cast5_amd64_cbc_dec
+.globl _gcry_cast5_amd64_cbc_dec
 .type   _gcry_cast5_amd64_cbc_dec, at function;
 _gcry_cast5_amd64_cbc_dec:
 	/* input:
@@ -529,7 +529,7 @@ _gcry_cast5_amd64_cbc_dec:
 .size _gcry_cast5_amd64_cbc_dec,.-_gcry_cast5_amd64_cbc_dec;
 
 .align 8
-.global _gcry_cast5_amd64_cfb_dec
+.globl _gcry_cast5_amd64_cfb_dec
 .type   _gcry_cast5_amd64_cfb_dec, at function;
 _gcry_cast5_amd64_cfb_dec:
 	/* input:
diff --git a/cipher/rijndael-amd64.S b/cipher/rijndael-amd64.S
index 2a7dd90..d360ea8 100644
--- a/cipher/rijndael-amd64.S
+++ b/cipher/rijndael-amd64.S
@@ -160,7 +160,7 @@
 	addroundkey((round) + 1, RNA, RNB, RNC, RND);
 
 .align 8
-.global _gcry_aes_amd64_encrypt_block
+.globl _gcry_aes_amd64_encrypt_block
 .type   _gcry_aes_amd64_encrypt_block, at function;
 
 _gcry_aes_amd64_encrypt_block:
@@ -281,7 +281,7 @@ _gcry_aes_amd64_encrypt_block:
 	addroundkey(round, RNA, RNB, RNC, RND);
 
 .align 8
-.global _gcry_aes_amd64_decrypt_block
+.globl _gcry_aes_amd64_decrypt_block
 .type   _gcry_aes_amd64_decrypt_block, at function;
 
 _gcry_aes_amd64_decrypt_block:
diff --git a/cipher/rijndael-arm.S b/cipher/rijndael-arm.S
index 2a747bf..22c350c 100644
--- a/cipher/rijndael-arm.S
+++ b/cipher/rijndael-arm.S
@@ -211,7 +211,7 @@
 	addroundkey(rna, rnb, rnc, rnd, ra, rb, rc, rd, dummy);
 
 .align 3
-.global _gcry_aes_arm_encrypt_block
+.globl _gcry_aes_arm_encrypt_block
 .type   _gcry_aes_arm_encrypt_block,%function;
 
 _gcry_aes_arm_encrypt_block:
@@ -465,7 +465,7 @@ _gcry_aes_arm_encrypt_block:
 	addroundkey(rna, rnb, rnc, rnd, ra, rb, rc, rd, dummy);
 
 .align 3
-.global _gcry_aes_arm_decrypt_block
+.globl _gcry_aes_arm_decrypt_block
 .type   _gcry_aes_arm_decrypt_block,%function;
 
 _gcry_aes_arm_decrypt_block:
diff --git a/cipher/serpent-avx2-amd64.S b/cipher/serpent-avx2-amd64.S
index 8a76ab1..532361d 100644
--- a/cipher/serpent-avx2-amd64.S
+++ b/cipher/serpent-avx2-amd64.S
@@ -588,7 +588,7 @@ __serpent_dec_blk16:
 	vpsubq tmp, x, x;
 
 .align 8
-.global _gcry_serpent_avx2_ctr_enc
+.globl _gcry_serpent_avx2_ctr_enc
 .type   _gcry_serpent_avx2_ctr_enc, at function;
 _gcry_serpent_avx2_ctr_enc:
 	/* input:
@@ -695,7 +695,7 @@ _gcry_serpent_avx2_ctr_enc:
 .size _gcry_serpent_avx2_ctr_enc,.-_gcry_serpent_avx2_ctr_enc;
 
 .align 8
-.global _gcry_serpent_avx2_cbc_dec
+.globl _gcry_serpent_avx2_cbc_dec
 .type   _gcry_serpent_avx2_cbc_dec, at function;
 _gcry_serpent_avx2_cbc_dec:
 	/* input:
@@ -746,7 +746,7 @@ _gcry_serpent_avx2_cbc_dec:
 .size _gcry_serpent_avx2_cbc_dec,.-_gcry_serpent_avx2_cbc_dec;
 
 .align 8
-.global _gcry_serpent_avx2_cfb_dec
+.globl _gcry_serpent_avx2_cfb_dec
 .type   _gcry_serpent_avx2_cfb_dec, at function;
 _gcry_serpent_avx2_cfb_dec:
 	/* input:
diff --git a/cipher/serpent-sse2-amd64.S b/cipher/serpent-sse2-amd64.S
index 516126b..f2be236 100644
--- a/cipher/serpent-sse2-amd64.S
+++ b/cipher/serpent-sse2-amd64.S
@@ -605,7 +605,7 @@ __serpent_dec_blk8:
 .size __serpent_dec_blk8,.-__serpent_dec_blk8;
 
 .align 8
-.global _gcry_serpent_sse2_ctr_enc
+.globl _gcry_serpent_sse2_ctr_enc
 .type   _gcry_serpent_sse2_ctr_enc, at function;
 _gcry_serpent_sse2_ctr_enc:
 	/* input:
@@ -735,7 +735,7 @@ _gcry_serpent_sse2_ctr_enc:
 .size _gcry_serpent_sse2_ctr_enc,.-_gcry_serpent_sse2_ctr_enc;
 
 .align 8
-.global _gcry_serpent_sse2_cbc_dec
+.globl _gcry_serpent_sse2_cbc_dec
 .type   _gcry_serpent_sse2_cbc_dec, at function;
 _gcry_serpent_sse2_cbc_dec:
 	/* input:
@@ -796,7 +796,7 @@ _gcry_serpent_sse2_cbc_dec:
 .size _gcry_serpent_sse2_cbc_dec,.-_gcry_serpent_sse2_cbc_dec;
 
 .align 8
-.global _gcry_serpent_sse2_cfb_dec
+.globl _gcry_serpent_sse2_cfb_dec
 .type   _gcry_serpent_sse2_cfb_dec, at function;
 _gcry_serpent_sse2_cfb_dec:
 	/* input:
diff --git a/cipher/twofish-amd64.S b/cipher/twofish-amd64.S
index 45548d2..c923d22 100644
--- a/cipher/twofish-amd64.S
+++ b/cipher/twofish-amd64.S
@@ -165,7 +165,7 @@
 	movl x, (4 * (n))(out);
 
 .align 8
-.global _gcry_twofish_amd64_encrypt_block
+.globl _gcry_twofish_amd64_encrypt_block
 .type   _gcry_twofish_amd64_encrypt_block, at function;
 
 _gcry_twofish_amd64_encrypt_block:
@@ -208,7 +208,7 @@ _gcry_twofish_amd64_encrypt_block:
 .size _gcry_twofish_amd64_encrypt_block,.-_gcry_twofish_amd64_encrypt_block;
 
 .align 8
-.global _gcry_twofish_amd64_decrypt_block
+.globl _gcry_twofish_amd64_decrypt_block
 .type   _gcry_twofish_amd64_decrypt_block, at function;
 
 _gcry_twofish_amd64_decrypt_block:
@@ -514,7 +514,7 @@ __twofish_dec_blk3:
 .size __twofish_dec_blk3,.-__twofish_dec_blk3;
 
 .align 8
-.global _gcry_twofish_amd64_ctr_enc
+.globl _gcry_twofish_amd64_ctr_enc
 .type   _gcry_twofish_amd64_ctr_enc, at function;
 _gcry_twofish_amd64_ctr_enc:
 	/* input:
@@ -596,7 +596,7 @@ _gcry_twofish_amd64_ctr_enc:
 .size _gcry_twofish_amd64_ctr_enc,.-_gcry_twofish_amd64_ctr_enc;
 
 .align 8
-.global _gcry_twofish_amd64_cbc_dec
+.globl _gcry_twofish_amd64_cbc_dec
 .type   _gcry_twofish_amd64_cbc_dec, at function;
 _gcry_twofish_amd64_cbc_dec:
 	/* input:
@@ -662,7 +662,7 @@ _gcry_twofish_amd64_cbc_dec:
 .size _gcry_twofish_amd64_cbc_dec,.-_gcry_twofish_amd64_cbc_dec;
 
 .align 8
-.global _gcry_twofish_amd64_cfb_dec
+.globl _gcry_twofish_amd64_cfb_dec
 .type   _gcry_twofish_amd64_cfb_dec, at function;
 _gcry_twofish_amd64_cfb_dec:
 	/* input:
diff --git a/cipher/twofish-arm.S b/cipher/twofish-arm.S
index ee22f56..ead2240 100644
--- a/cipher/twofish-arm.S
+++ b/cipher/twofish-arm.S
@@ -257,7 +257,7 @@
 	ror1(RD);
 
 .align 3
-.global _gcry_twofish_arm_encrypt_block
+.globl _gcry_twofish_arm_encrypt_block
 .type   _gcry_twofish_arm_encrypt_block,%function;
 
 _gcry_twofish_arm_encrypt_block:
@@ -308,7 +308,7 @@ _gcry_twofish_arm_encrypt_block:
 .size _gcry_twofish_arm_encrypt_block,.-_gcry_twofish_arm_encrypt_block;
 
 .align 3
-.global _gcry_twofish_arm_decrypt_block
+.globl _gcry_twofish_arm_decrypt_block
 .type   _gcry_twofish_arm_decrypt_block,%function;
 
 _gcry_twofish_arm_decrypt_block:




More information about the Gcrypt-devel mailing list