From 415f579bf39f20ba904fb983edca8dd960fc0f32 Mon Sep 17 00:00:00 2001 From: Boris Gjenero Date: Wed, 9 Nov 2011 19:20:33 +0000 Subject: Fix assembler .size directives. Currently used binutils don't complain, but 2.21.1 treats these as errors. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30945 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/lib/grey_sh.S | 2 +- firmware/decompressor/sh_nrv2e_d8.S | 2 +- firmware/target/arm/imx31/rolo_restart_firmware.S | 2 +- firmware/target/arm/support-arm.S | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/plugins/lib/grey_sh.S b/apps/plugins/lib/grey_sh.S index 5bc003c2b3..5714f95f8c 100644 --- a/apps/plugins/lib/grey_sh.S +++ b/apps/plugins/lib/grey_sh.S @@ -132,6 +132,6 @@ __grey_line1: rts nop - .size _grey_line1, . - _grey_line1 + .size __grey_line1, . - __grey_line1 #endif diff --git a/firmware/decompressor/sh_nrv2e_d8.S b/firmware/decompressor/sh_nrv2e_d8.S index 6a050834a9..cf333e9c97 100644 --- a/firmware/decompressor/sh_nrv2e_d8.S +++ b/firmware/decompressor/sh_nrv2e_d8.S @@ -146,4 +146,4 @@ copy_n2e: bf copy_n2e bt top_n2e ! always taken if the preceding bf isn't - .size ucl_nrv2e_decompress_8, .-ucl_nrv2e_decompress_8 + .size _ucl_nrv2e_decompress_8, .-_ucl_nrv2e_decompress_8 diff --git a/firmware/target/arm/imx31/rolo_restart_firmware.S b/firmware/target/arm/imx31/rolo_restart_firmware.S index 45d37d14ef..79d335ac46 100644 --- a/firmware/target/arm/imx31/rolo_restart_firmware.S +++ b/firmware/target/arm/imx31/rolo_restart_firmware.S @@ -65,4 +65,4 @@ restart_copy_start: @ Branch to destination (should be address 0x00000000) bx r1 restart_copy_end: - .size rolo_restart,.-rolo_restart + .size rolo_restart_firmware,.-rolo_restart_firmware diff --git a/firmware/target/arm/support-arm.S b/firmware/target/arm/support-arm.S index 23335bf01c..6141a3f158 100644 --- a/firmware/target/arm/support-arm.S +++ b/firmware/target/arm/support-arm.S @@ -662,7 +662,7 @@ __divsi3: #else __aeabi_uidivmod: ARMV4_UDIV32_BODY r0, r1, r0, r1, r2, r3, __div0_wrap, 1 - .size __aeabi_uidivmod, . - __aeabi_uidivmo + .size __aeabi_uidivmod, . - __aeabi_uidivmod __aeabi_idivmod: ARMV4_SDIV32_BODY r0, r1, r0, r1, r2, r3, __div0_wrap, 1 @@ -683,7 +683,7 @@ __divsi3: #else __aeabi_uidivmod: ARMV5_UDIV32_BODY r0, r1, r0, r1, r2, r3, ip, __div0_wrap, 1 - .size __aeabi_uidivmod, . - __aeabi_uidivmo + .size __aeabi_uidivmod, . - __aeabi_uidivmod __aeabi_idivmod: str lr, [sp, #-4] -- cgit v1.2.3