diff options
| author | Boris Gjenero <dreamlayers@rockbox.org> | 2011-11-09 19:20:33 +0000 |
|---|---|---|
| committer | Boris Gjenero <dreamlayers@rockbox.org> | 2011-11-09 19:20:33 +0000 |
| commit | 415f579bf39f20ba904fb983edca8dd960fc0f32 (patch) | |
| tree | 304f859fe86ee1be2807ba55a716262043a4921d | |
| parent | d01954cad2a8b6de0faadec599a24bac14350043 (diff) | |
| download | rockbox-415f579bf39f20ba904fb983edca8dd960fc0f32.tar.gz rockbox-415f579bf39f20ba904fb983edca8dd960fc0f32.zip | |
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
| -rw-r--r-- | apps/plugins/lib/grey_sh.S | 2 | ||||
| -rw-r--r-- | firmware/decompressor/sh_nrv2e_d8.S | 2 | ||||
| -rw-r--r-- | firmware/target/arm/imx31/rolo_restart_firmware.S | 2 | ||||
| -rw-r--r-- | 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: | |||
| 132 | 132 | ||
| 133 | rts | 133 | rts |
| 134 | nop | 134 | nop |
| 135 | .size _grey_line1, . - _grey_line1 | 135 | .size __grey_line1, . - __grey_line1 |
| 136 | 136 | ||
| 137 | #endif | 137 | #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: | |||
| 146 | bf copy_n2e | 146 | bf copy_n2e |
| 147 | bt top_n2e ! always taken if the preceding bf isn't | 147 | bt top_n2e ! always taken if the preceding bf isn't |
| 148 | 148 | ||
| 149 | .size ucl_nrv2e_decompress_8, .-ucl_nrv2e_decompress_8 | 149 | .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: | |||
| 65 | @ Branch to destination (should be address 0x00000000) | 65 | @ Branch to destination (should be address 0x00000000) |
| 66 | bx r1 | 66 | bx r1 |
| 67 | restart_copy_end: | 67 | restart_copy_end: |
| 68 | .size rolo_restart,.-rolo_restart | 68 | .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: | |||
| 662 | #else | 662 | #else |
| 663 | __aeabi_uidivmod: | 663 | __aeabi_uidivmod: |
| 664 | ARMV4_UDIV32_BODY r0, r1, r0, r1, r2, r3, __div0_wrap, 1 | 664 | ARMV4_UDIV32_BODY r0, r1, r0, r1, r2, r3, __div0_wrap, 1 |
| 665 | .size __aeabi_uidivmod, . - __aeabi_uidivmo | 665 | .size __aeabi_uidivmod, . - __aeabi_uidivmod |
| 666 | 666 | ||
| 667 | __aeabi_idivmod: | 667 | __aeabi_idivmod: |
| 668 | ARMV4_SDIV32_BODY r0, r1, r0, r1, r2, r3, __div0_wrap, 1 | 668 | ARMV4_SDIV32_BODY r0, r1, r0, r1, r2, r3, __div0_wrap, 1 |
| @@ -683,7 +683,7 @@ __divsi3: | |||
| 683 | #else | 683 | #else |
| 684 | __aeabi_uidivmod: | 684 | __aeabi_uidivmod: |
| 685 | ARMV5_UDIV32_BODY r0, r1, r0, r1, r2, r3, ip, __div0_wrap, 1 | 685 | ARMV5_UDIV32_BODY r0, r1, r0, r1, r2, r3, ip, __div0_wrap, 1 |
| 686 | .size __aeabi_uidivmod, . - __aeabi_uidivmo | 686 | .size __aeabi_uidivmod, . - __aeabi_uidivmod |
| 687 | 687 | ||
| 688 | __aeabi_idivmod: | 688 | __aeabi_idivmod: |
| 689 | str lr, [sp, #-4] | 689 | str lr, [sp, #-4] |