diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-24 19:57:28 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-24 19:57:28 -0500 |
| commit | 928ab832caa67c0c1a44e3a8e1483b0ed33cda50 (patch) | |
| tree | 6e3df2d0437f834971fe28bdf519a2c8da694fc1 /ldso/ldso/arm/dl-startup.h | |
| parent | 74c69da52ad5029cd2fc2d3d41d581022ed0a7aa (diff) | |
| parent | f1f98784e65ce9621a570af50998b1940e7fb81d (diff) | |
merge uClibc changes
Diffstat (limited to 'ldso/ldso/arm/dl-startup.h')
| -rw-r--r-- | ldso/ldso/arm/dl-startup.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h index df2c82469..eb2a9a22a 100644 --- a/ldso/ldso/arm/dl-startup.h +++ b/ldso/ldso/arm/dl-startup.h @@ -47,11 +47,7 @@ __asm__( " ldr r0, .L_FINI_PROC\n" " ldr r0, [sl, r0]\n" " @ jump to the user_s entry point\n" -#if defined(__USE_BX__) - " bx r6\n" -#else - " mov pc, r6\n" -#endif + " " __stringify(BX(r6)) "\n" ".L_GET_GOT:\n" " .word _GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4\n" ".L_SKIP_ARGS:\n" @@ -113,11 +109,7 @@ __asm__( " ldr r0, .L_FINI_PROC\n" " ldr r0, [r7, r0]\n" " @ jump to the user_s entry point\n" -#if defined(__USE_BX__) - " bx r6\n" -#else - " mov pc, r6\n" -#endif + " " __stringify(BX(r6)) "\n" "\n\n" ".L_GET_GOT:\n" " .word _GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4\n" |