diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-10-31 09:19:28 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-10-31 09:19:28 +0100 |
| commit | 57da2a23951b1c5dbea3e9ceea60d50020141592 (patch) | |
| tree | cd03f44eed1e770c2d94a0e479a03db3c042b805 /sysdeps | |
| parent | 62c482e93f407bcc7971547742094301374b841e (diff) | |
| parent | 3ed7c33fa2915008ec861f25b2d54a0ccc59ca21 (diff) | |
| download | glibc-57da2a23951b1c5dbea3e9ceea60d50020141592.zip glibc-57da2a23951b1c5dbea3e9ceea60d50020141592.tar.gz glibc-57da2a23951b1c5dbea3e9ceea60d50020141592.tar.bz2 | |
Merge branch 'master' of git://sourceware.org/git/glibc
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/gnu/errlist.c | 15 | ||||
| -rw-r--r-- | sysdeps/riscv/start.S | 7 |
2 files changed, 20 insertions, 2 deletions
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c index 31ebfa9..77577bf 100644 --- a/sysdeps/gnu/errlist.c +++ b/sysdeps/gnu/errlist.c @@ -974,7 +974,20 @@ TRANS You did @strong{what}? */ #endif #ifdef EIEIO /* -TRANS Go home and have a glass of warm, dairy-fresh milk. */ +TRANS Go home and have a glass of warm, dairy-fresh milk. +TRANS @c Okay. Since you are dying to know, I'll tell you. +TRANS @c This is a joke, obviously. There is a children's song which begins, +TRANS @c "Old McDonald had a farm, e-i-e-i-o." Every time I see the (real) +TRANS @c errno macro EIO, I think about that song. Probably most of my +TRANS @c compatriots who program on Unix do, too. One of them must have stayed +TRANS @c up a little too late one night and decided to add it to Hurd or Glibc. +TRANS @c Whoever did it should be castigated, but it made me laugh. +TRANS @c --jtobey@channel1.com +TRANS @c +TRANS @c "bought the farm" means "died". -jtobey +TRANS @c +TRANS @c Translators, please do not translate this litteraly, translate it into +TRANS @c an idiomatic funny way of saying that the computer died. */ [ERR_REMAP (EIEIO)] = N_("Computer bought the farm"), # if EIEIO > ERR_MAX # undef ERR_MAX diff --git a/sysdeps/riscv/start.S b/sysdeps/riscv/start.S index 4635ddb..2d6f06e 100644 --- a/sysdeps/riscv/start.S +++ b/sysdeps/riscv/start.S @@ -43,6 +43,10 @@ __libc_start_main wants this in a5. */ ENTRY (ENTRY_POINT) + /* Terminate call stack by noting ra is undefined. Use a dummy + .cfi_label to force starting the FDE. */ + .cfi_label .Ldummy + cfi_undefined (ra) call .Lload_gp mv a5, a0 /* rtld_fini. */ /* main may be in a shared library. */ @@ -54,7 +58,8 @@ ENTRY (ENTRY_POINT) lla a4, __libc_csu_fini mv a6, sp /* stack_end. */ - tail __libc_start_main@plt + call __libc_start_main@plt + ebreak END (ENTRY_POINT) /* Dynamic links need the global pointer to be initialized prior to calling |