diff options
| -rw-r--r-- | ldso/ldso/arm/boot1_arch.h | 25 | ||||
| -rw-r--r-- | ldso/ldso/arm/dl-startup.h | 25 |
2 files changed, 24 insertions, 26 deletions
diff --git a/ldso/ldso/arm/boot1_arch.h b/ldso/ldso/arm/boot1_arch.h index af9acc22c..b3ba36117 100644 --- a/ldso/ldso/arm/boot1_arch.h +++ b/ldso/ldso/arm/boot1_arch.h @@ -5,19 +5,18 @@ /* Overrive the default _dl_boot function, and replace it with a bit of asm. * Then call the real _dl_boot function, which is now named _dl_boot2. */ -asm("\ -.text -.globl _dl_boot -_dl_boot: - mov r7, sp -@ ldr r0, [sp], #4 - mov r0,sp - bl _dl_boot2 - mov r6, r0 - mov r0, r7 - mov pc, r6 -\n\ -"); +asm("" \ +" .text\n" \ +" .globl _dl_boot\n" \ +"_dl_boot:\n" \ +" mov r7, sp\n" \ +" @ldr r0, [sp], #4\n" \ +" mov r0, sp\n" \ +" bl _dl_boot2\n" \ +" mov r6, r0\n" \ +" mov r0, r7\n" \ +" mov pc, r6\n" \ +); #define _dl_boot _dl_boot2 #define LD_BOOT(X) static void * __attribute__ ((unused)) _dl_boot (X) diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h index af9acc22c..b3ba36117 100644 --- a/ldso/ldso/arm/dl-startup.h +++ b/ldso/ldso/arm/dl-startup.h @@ -5,19 +5,18 @@ /* Overrive the default _dl_boot function, and replace it with a bit of asm. * Then call the real _dl_boot function, which is now named _dl_boot2. */ -asm("\ -.text -.globl _dl_boot -_dl_boot: - mov r7, sp -@ ldr r0, [sp], #4 - mov r0,sp - bl _dl_boot2 - mov r6, r0 - mov r0, r7 - mov pc, r6 -\n\ -"); +asm("" \ +" .text\n" \ +" .globl _dl_boot\n" \ +"_dl_boot:\n" \ +" mov r7, sp\n" \ +" @ldr r0, [sp], #4\n" \ +" mov r0, sp\n" \ +" bl _dl_boot2\n" \ +" mov r6, r0\n" \ +" mov r0, r7\n" \ +" mov pc, r6\n" \ +); #define _dl_boot _dl_boot2 #define LD_BOOT(X) static void * __attribute__ ((unused)) _dl_boot (X) |