diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-04 13:37:16 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-04 13:37:16 -0600 |
| commit | 474700954dda085369a77e76c1c13a2c93b0a7e1 (patch) | |
| tree | 8c4f30736e3331d09d0525847b48d49b40f39889 /ldso/ldso/dl-startup.c | |
| parent | 885d9c24d4c21da941603baf555fc72a3765bbe3 (diff) | |
| parent | 8e5113112ae7d3402e2afb01c8cee18d3beb0f2e (diff) | |
Merge remote-tracking branch 'origin/upstream' into 1.0
Diffstat (limited to 'ldso/ldso/dl-startup.c')
| -rw-r--r-- | ldso/ldso/dl-startup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c index 4893409e9..18a39ce2c 100644 --- a/ldso/ldso/dl-startup.c +++ b/ldso/ldso/dl-startup.c @@ -95,8 +95,8 @@ #include "dl-startup.h" #ifdef __LDSO_PRELINK_SUPPORT__ -/* These defined magically in the linker script. */ -extern char _begin[] attribute_hidden; +/* This is defined by the linker script. */ +extern ElfW(Addr) _begin[] attribute_hidden; #endif /* Static declarations */ @@ -181,7 +181,7 @@ DL_START(unsigned long args) */ if (!auxvt[AT_BASE].a_un.a_val) - auxvt[AT_BASE].a_un.a_val = (Elf32_Addr) &_begin; + auxvt[AT_BASE].a_un.a_val = (ElfW(Addr)) &_begin; /* Note: if the dynamic linker itself is prelinked, the load_addr is 0 */ DL_INIT_LOADADDR_BOOT(load_addr, elf_machine_load_address()); #else |