diff options
| author | Ryan S. Arnold <rsa@linux.vnet.ibm.com> | 2013-05-14 14:54:50 -0500 |
|---|---|---|
| committer | Ryan S. Arnold <rsa@linux.vnet.ibm.com> | 2013-05-14 14:54:50 -0500 |
| commit | 6d6691c0f4a53c0e1c1915e19e71544c6b55b491 (patch) | |
| tree | 5c7728ea09523f99bfd9c542ad7ef962dd995c67 /elf/dl-sysdep.c | |
| parent | 82fb7c849d61b544174de646181f5a159adb6ceb (diff) | |
| parent | 0175558aa0a16a647ee368898a83a7d42e2011e8 (diff) | |
| download | glibc-6d6691c0f4a53c0e1c1915e19e71544c6b55b491.tar.gz | |
Merge remote branch 'origin/master' into local_rsa_hwcap2_v3
Conflicts:
ports/ChangeLog.arm
Diffstat (limited to 'elf/dl-sysdep.c')
| -rw-r--r-- | elf/dl-sysdep.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index 832a57b6d6..6fdcb13145 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -214,10 +214,15 @@ _dl_sysdep_start (void **start_argptr, GLRO(dl_pagesize) = __getpagesize (); #endif -#if defined NEED_DL_SYSINFO - /* Only set the sysinfo value if we also have the vsyscall DSO. */ - if (GLRO(dl_sysinfo_dso) != 0 && new_sysinfo) - GLRO(dl_sysinfo) = new_sysinfo; +#ifdef NEED_DL_SYSINFO + if (new_sysinfo != 0) + { +# ifdef NEED_DL_SYSINFO_DSO + /* Only set the sysinfo value if we also have the vsyscall DSO. */ + if (GLRO(dl_sysinfo_dso) != 0) +# endif + GLRO(dl_sysinfo) = new_sysinfo; + } #endif #ifdef DL_SYSDEP_INIT |