parent
5820306407
commit
816f76457c
@ -1,13 +0,0 @@ |
||||
--- a/ldso/ldso/mips/elfinterp.c
|
||||
+++ b/ldso/ldso/mips/elfinterp.c
|
||||
@@ -378,8 +378,9 @@ void _dl_perform_mips_global_got_relocat
|
||||
*got_entry += (unsigned long) tpnt->loadaddr;
|
||||
}
|
||||
else {
|
||||
+ struct symbol_ref sym_ref = { sym, NULL };
|
||||
*got_entry = (unsigned long) _dl_find_hash(strtab +
|
||||
- sym->st_name, tpnt->symbol_scope, tpnt, ELF_RTYPE_CLASS_PLT, NULL);
|
||||
+ sym->st_name, tpnt->symbol_scope, tpnt, ELF_RTYPE_CLASS_PLT, &sym_ref);
|
||||
}
|
||||
|
||||
got_entry++;
|
@ -1,41 +0,0 @@ |
||||
"Use BX" is not available on all CPUs, so the option depends on
|
||||
a correct CPU to be chosen . It is weird that e BX" then appears
|
||||
_above_ the CPU selection, not below.
|
||||
|
||||
Move the "Use BX" after the CPU selection.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
|
||||
Cc: Khem Raj <raj.khem@gmail.com>
|
||||
Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
||||
Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
|
||||
---
|
||||
extra/Configs/Config.arm | 14 +++++++-------
|
||||
1 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/extra/Configs/Config.arm
|
||||
+++ b/extra/Configs/Config.arm
|
||||
@@ -30,13 +30,6 @@ config CONFIG_ARM_EABI
|
||||
|
||||
endchoice
|
||||
|
||||
-config USE_BX
|
||||
- bool "Use BX in function return"
|
||||
- default y
|
||||
- depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
|
||||
- help
|
||||
- Use BX instruction for THUMB aware architectures.
|
||||
-
|
||||
choice
|
||||
prompt "Target Processor Type"
|
||||
default CONFIG_GENERIC_ARM
|
||||
@@ -131,3 +124,10 @@ config CONFIG_ARM_IWMMXT
|
||||
select ARCH_HAS_MMU
|
||||
|
||||
endchoice
|
||||
+
|
||||
+config USE_BX
|
||||
+ bool "Use BX in function return"
|
||||
+ default y
|
||||
+ depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
|
||||
+ help
|
||||
+ Use BX instruction for THUMB aware architectures.
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue