From a005500724dc396c5b87d7241f6c122bb5de0dfd Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Thu, 4 Nov 2004 15:01:40 +0000 Subject: [PATCH] * configure.tgt (crisv32-*-*): Handle like cris-*-* for non-aout. * emulparams/criself.sh (INIT_START): Remove emitted "push srp". (FINI_START): Ditto. (INIT_END): Remove emitted "jump [sp+]". (FINI_END): Ditto. --- ld/ChangeLog | 8 ++++++++ ld/configure.tgt | 5 +++-- ld/emulparams/criself.sh | 6 ------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index cfaeaccecb3..7c0cd74024a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2004-11-04 Hans-Peter Nilsson + + * configure.tgt (crisv32-*-*): Handle like cris-*-* for non-aout. + * emulparams/criself.sh (INIT_START): Remove emitted "push srp". + (FINI_START): Ditto. + (INIT_END): Remove emitted "jump [sp+]". + (FINI_END): Ditto. + 2004-11-04 Alan Modra * emultempl/ppc64elf.em (no_tls_opt): Rename from notlsopt. diff --git a/ld/configure.tgt b/ld/configure.tgt index 8a5cb612c42..ea942c7c973 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -30,8 +30,9 @@ cr16c-*-elf*) targ_emul=elf32cr16c ;; cris-*-*aout*) targ_emul=crisaout targ_extra_emuls="criself crislinux" targ_extra_libpath=$targ_extra_emuls ;; -cris-*-linux-gnu*) targ_emul=crislinux ;; -cris-*-*) targ_emul=criself +cris-*-linux-gnu* | cris-*-linux-gnu*) + targ_emul=crislinux ;; +cris-*-* | crisv32-*-*) targ_emul=criself targ_extra_emuls="crisaout crislinux" targ_extra_libpath=$targ_extra_emuls ;; crx-*-elf*) targ_emul=elf32crx ;; diff --git a/ld/emulparams/criself.sh b/ld/emulparams/criself.sh index 91fdcc5980d..8ac21f92fc9 100644 --- a/ld/emulparams/criself.sh +++ b/ld/emulparams/criself.sh @@ -53,12 +53,9 @@ INIT_START=' . = ALIGN(2); ___init__start = .; PROVIDE (___do_global_ctors = .); - SHORT (0xe1fc); /* push srp */ - SHORT (0xbe7e); ' INIT_END=' - SHORT (0x0d3e); /* jump [sp+] */ PROVIDE (__init__end = .); PROVIDE (___init__end = .); ' @@ -67,12 +64,9 @@ FINI_START=' . = ALIGN (2); ___fini__start = .; PROVIDE (___do_global_dtors = .); - SHORT (0xe1fc); /* push srp */ - SHORT (0xbe7e); ' FINI_END=' - SHORT (0x0d3e); /* jump [sp+] */ PROVIDE (__fini__end = .); ___fini__end = .; ' -- 2.30.2