diff options
author | Christopher Ferris <cferris@google.com> | 2017-05-24 16:00:37 -0700 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2017-05-24 16:06:11 -0700 |
commit | 866e7b6906b71542c7ab4ce17c5943243058964f (patch) | |
tree | 81587d3ceeaeeac9a06e49973e6fd854f0f6e9d6 | |
parent | 6c01208e902b18aad4b0254ccb95b94a2b5fc341 (diff) | |
download | bionic-866e7b6906b71542c7ab4ce17c5943243058964f.tar.gz |
Fix assembler warnings.
There are a few instructions deprecated on armv8 that result in lots
of warnings. Add an arch directive so that these warnings go away.
This doesn't cause any problems because the instructions still
execute properly.
Bug: 38319728
Test: Built all of these assembler files and verified the warning are gone.
Change-Id: If063defdd16f290c01975233c8d257d1b2005e76
-rw-r--r-- | libc/arch-arm/cortex-a15/bionic/__strcat_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a15/bionic/memcpy.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a15/bionic/memset.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a15/bionic/strcmp.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a53/bionic/__strcat_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a53/bionic/__strcpy_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a53/bionic/memcpy.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a7/bionic/__strcat_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a7/bionic/__strcpy_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a7/bionic/memcpy.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/cortex-a7/bionic/memset.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/denver/bionic/__strcat_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/denver/bionic/__strcpy_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/denver/bionic/memcpy.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/krait/bionic/__strcat_chk.S | 4 | ||||
-rw-r--r-- | libc/arch-arm/krait/bionic/__strcpy_chk.S | 4 |
17 files changed, 68 insertions, 0 deletions
diff --git a/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S b/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S index da40f6ced..ca29715a9 100644 --- a/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S +++ b/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of src string, then get the source of the dst string. // Check that the two lengths together don't exceed the threshold, then // do a memcpy of the data. diff --git a/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S b/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S index 026adcce7..2679c02cf 100644 --- a/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S +++ b/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of the source string first, then do a memcpy of the data // instead of a strcpy. ENTRY(__strcpy_chk) diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy.S b/libc/arch-arm/cortex-a15/bionic/memcpy.S index 9407a0851..7ad009357 100644 --- a/libc/arch-arm/cortex-a15/bionic/memcpy.S +++ b/libc/arch-arm/cortex-a15/bionic/memcpy.S @@ -59,6 +59,10 @@ .syntax unified .fpu neon + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + ENTRY(__memcpy_chk) cmp r2, r3 bls memcpy diff --git a/libc/arch-arm/cortex-a15/bionic/memset.S b/libc/arch-arm/cortex-a15/bionic/memset.S index 2542f3f21..4b4388e2e 100644 --- a/libc/arch-arm/cortex-a15/bionic/memset.S +++ b/libc/arch-arm/cortex-a15/bionic/memset.S @@ -37,6 +37,10 @@ .fpu neon .syntax unified + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + ENTRY(__memset_chk) cmp r2, r3 bls memset diff --git a/libc/arch-arm/cortex-a15/bionic/strcmp.S b/libc/arch-arm/cortex-a15/bionic/strcmp.S index 5c8914b63..d8993d55f 100644 --- a/libc/arch-arm/cortex-a15/bionic/strcmp.S +++ b/libc/arch-arm/cortex-a15/bionic/strcmp.S @@ -57,6 +57,10 @@ .thumb_func #endif + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + ENTRY(strcmp) /* Use LDRD whenever possible. */ diff --git a/libc/arch-arm/cortex-a53/bionic/__strcat_chk.S b/libc/arch-arm/cortex-a53/bionic/__strcat_chk.S index da40f6ced..ca29715a9 100644 --- a/libc/arch-arm/cortex-a53/bionic/__strcat_chk.S +++ b/libc/arch-arm/cortex-a53/bionic/__strcat_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of src string, then get the source of the dst string. // Check that the two lengths together don't exceed the threshold, then // do a memcpy of the data. diff --git a/libc/arch-arm/cortex-a53/bionic/__strcpy_chk.S b/libc/arch-arm/cortex-a53/bionic/__strcpy_chk.S index 026adcce7..2679c02cf 100644 --- a/libc/arch-arm/cortex-a53/bionic/__strcpy_chk.S +++ b/libc/arch-arm/cortex-a53/bionic/__strcpy_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of the source string first, then do a memcpy of the data // instead of a strcpy. ENTRY(__strcpy_chk) diff --git a/libc/arch-arm/cortex-a53/bionic/memcpy.S b/libc/arch-arm/cortex-a53/bionic/memcpy.S index 9407a0851..7ad009357 100644 --- a/libc/arch-arm/cortex-a53/bionic/memcpy.S +++ b/libc/arch-arm/cortex-a53/bionic/memcpy.S @@ -59,6 +59,10 @@ .syntax unified .fpu neon + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + ENTRY(__memcpy_chk) cmp r2, r3 bls memcpy diff --git a/libc/arch-arm/cortex-a7/bionic/__strcat_chk.S b/libc/arch-arm/cortex-a7/bionic/__strcat_chk.S index da40f6ced..ca29715a9 100644 --- a/libc/arch-arm/cortex-a7/bionic/__strcat_chk.S +++ b/libc/arch-arm/cortex-a7/bionic/__strcat_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of src string, then get the source of the dst string. // Check that the two lengths together don't exceed the threshold, then // do a memcpy of the data. diff --git a/libc/arch-arm/cortex-a7/bionic/__strcpy_chk.S b/libc/arch-arm/cortex-a7/bionic/__strcpy_chk.S index 026adcce7..2679c02cf 100644 --- a/libc/arch-arm/cortex-a7/bionic/__strcpy_chk.S +++ b/libc/arch-arm/cortex-a7/bionic/__strcpy_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of the source string first, then do a memcpy of the data // instead of a strcpy. ENTRY(__strcpy_chk) diff --git a/libc/arch-arm/cortex-a7/bionic/memcpy.S b/libc/arch-arm/cortex-a7/bionic/memcpy.S index 9407a0851..7ad009357 100644 --- a/libc/arch-arm/cortex-a7/bionic/memcpy.S +++ b/libc/arch-arm/cortex-a7/bionic/memcpy.S @@ -59,6 +59,10 @@ .syntax unified .fpu neon + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + ENTRY(__memcpy_chk) cmp r2, r3 bls memcpy diff --git a/libc/arch-arm/cortex-a7/bionic/memset.S b/libc/arch-arm/cortex-a7/bionic/memset.S index e4fb1b4c7..72ee61363 100644 --- a/libc/arch-arm/cortex-a7/bionic/memset.S +++ b/libc/arch-arm/cortex-a7/bionic/memset.S @@ -37,6 +37,10 @@ .fpu neon .syntax unified + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + ENTRY(__memset_chk) cmp r2, r3 bls memset diff --git a/libc/arch-arm/denver/bionic/__strcat_chk.S b/libc/arch-arm/denver/bionic/__strcat_chk.S index 9f7db59dd..d4f651c22 100644 --- a/libc/arch-arm/denver/bionic/__strcat_chk.S +++ b/libc/arch-arm/denver/bionic/__strcat_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of src string, then get the source of the dst string. // Check that the two lengths together don't exceed the threshold, then // do a memcpy of the data. diff --git a/libc/arch-arm/denver/bionic/__strcpy_chk.S b/libc/arch-arm/denver/bionic/__strcpy_chk.S index 9b7ea91d7..9295a0074 100644 --- a/libc/arch-arm/denver/bionic/__strcpy_chk.S +++ b/libc/arch-arm/denver/bionic/__strcpy_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of the source string first, then do a memcpy of the data // instead of a strcpy. ENTRY(__strcpy_chk) diff --git a/libc/arch-arm/denver/bionic/memcpy.S b/libc/arch-arm/denver/bionic/memcpy.S index d4e0fb4dc..743c74b84 100644 --- a/libc/arch-arm/denver/bionic/memcpy.S +++ b/libc/arch-arm/denver/bionic/memcpy.S @@ -61,6 +61,10 @@ .syntax unified .fpu neon + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + ENTRY(__memcpy_chk) cmp r2, r3 bls memcpy diff --git a/libc/arch-arm/krait/bionic/__strcat_chk.S b/libc/arch-arm/krait/bionic/__strcat_chk.S index a46ff9800..32fa82d08 100644 --- a/libc/arch-arm/krait/bionic/__strcat_chk.S +++ b/libc/arch-arm/krait/bionic/__strcat_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of src string, then get the source of the dst string. // Check that the two lengths together don't exceed the threshold, then // do a memcpy of the data. diff --git a/libc/arch-arm/krait/bionic/__strcpy_chk.S b/libc/arch-arm/krait/bionic/__strcpy_chk.S index 9c2f66a77..ca4cf7f5d 100644 --- a/libc/arch-arm/krait/bionic/__strcpy_chk.S +++ b/libc/arch-arm/krait/bionic/__strcpy_chk.S @@ -33,6 +33,10 @@ .thumb .thumb_func + // To avoid warning about deprecated instructions, add an explicit + // arch. The code generated is exactly the same. + .arch armv7-a + // Get the length of the source string first, then do a memcpy of the data // instead of a strcpy. ENTRY(__strcpy_chk) |