diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/arm/dl-machine.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/fsuid.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 53aa806ec2..b8a1e19359 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -284,6 +284,7 @@ _dl_start_user: @ now we enter a _dl_init_next loop ldr r4, .L_MAIN_SEARCHLIST ldr r4, [sl, r4] + ldr r4, [r4] @ call _dl_init_next to get the address of an initalizer 0: mov r0, r4 bl _dl_init_next(PLT) diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 94c4361540..4f116b57cb 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -112,16 +112,17 @@ if test $host = $build; then ac_prefix=$ac_default_prefix fi AC_MSG_CHECKING([for symlinks in ${ac_prefix}/include]) + ac_message= if test -L ${ac_prefix}/include/net; then - message=" ${ac_prefix}/include/net is a symlink" + ac_message="$ac_message + ${ac_prefix}/include/net is a symlink" fi if test -L ${ac_prefix}/include/scsi; then - message="$message + ac_message="$ac_message ${ac_prefix}/include/scsi is a symlink" fi - if test -n "$message"; then - AC_MSG_ERROR([ -$message + if test -n "$ac_message"; then + AC_MSG_ERROR([$ac_message \`make install' will destroy the target of the link(s). Delete the links and re-run configure, or better still, move the entire ${ac_prefix}/include directory out of the way.]) diff --git a/sysdeps/unix/sysv/linux/sys/fsuid.h b/sysdeps/unix/sysv/linux/sys/fsuid.h index fd30542e9f..cb8915a52e 100644 --- a/sysdeps/unix/sysv/linux/sys/fsuid.h +++ b/sysdeps/unix/sysv/linux/sys/fsuid.h @@ -25,7 +25,7 @@ __BEGIN_DECLS /* Change uid used for file access control to UID, without affecting - other priveledges (such as who can send signals at the process). */ + other privileges (such as who can send signals at the process). */ extern int setfsuid __P ((__uid_t __uid)); /* Ditto for group id. */ |