diff options
| -rw-r--r-- | ldso/ldso/arm/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/avr32/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/bfin/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/cris/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/i386/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/m68k/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/mips/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/powerpc/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/sh/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/sh64/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/sparc/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/x86_64/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/ldso/xtensa/elfinterp.c | 3 | 
13 files changed, 26 insertions, 13 deletions
diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c index d8dcb52ac..cde055d59 100644 --- a/ldso/ldso/arm/elfinterp.c +++ b/ldso/ldso/arm/elfinterp.c @@ -217,9 +217,10 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct r_scope_elem *scope,  			return 1;  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  					&sym_ref, elf_machine_type_class(reloc_type)); +		}  		def_mod = sym_ref.tpnt;  	} else {  		/* diff --git a/ldso/ldso/avr32/elfinterp.c b/ldso/ldso/avr32/elfinterp.c index c3c5b4907..dd17fdc87 100644 --- a/ldso/ldso/avr32/elfinterp.c +++ b/ldso/ldso/avr32/elfinterp.c @@ -149,9 +149,10 @@ static int _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,  				    _dl_progname, symname);  			return 0;  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  				&sym_ref, elf_machine_type_class(reloc_type)); +		}  	}  #if defined(__SUPPORT_LD_DEBUG__) diff --git a/ldso/ldso/bfin/elfinterp.c b/ldso/ldso/bfin/elfinterp.c index 42c113c50..3d14126c4 100644 --- a/ldso/ldso/bfin/elfinterp.c +++ b/ldso/ldso/bfin/elfinterp.c @@ -197,9 +197,10 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct r_scope_elem *scope,  				     _dl_progname, symname);  			_dl_exit (1);  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  				&sym_ref, elf_machine_type_class(reloc_type)); +		}  		symbol_tpnt = sym_ref.tpnt;  	} diff --git a/ldso/ldso/cris/elfinterp.c b/ldso/ldso/cris/elfinterp.c index c3af90b99..cc4920d94 100644 --- a/ldso/ldso/cris/elfinterp.c +++ b/ldso/ldso/cris/elfinterp.c @@ -186,9 +186,10 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,  		}  		symbol_addr += rpnt->r_addend; -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  				&sym_ref, elf_machine_type_class(reloc_type)); +		}  	}  #if defined (__SUPPORT_LD_DEBUG__) diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c index 39c4e1d06..9772e9a46 100644 --- a/ldso/ldso/i386/elfinterp.c +++ b/ldso/ldso/i386/elfinterp.c @@ -190,9 +190,10 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,  		if (unlikely(!symbol_addr && (ELF_ST_TYPE(symtab[symtab_index].st_info) != STT_TLS)  					&& ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK))  			return 1; -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  					&sym_ref, elf_machine_type_class(reloc_type)); +		}  		tls_tpnt = sym_ref.tpnt;  	} else {  		symbol_addr = symtab[symtab_index].st_value; diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c index 8ad4ae58b..4e8714246 100644 --- a/ldso/ldso/m68k/elfinterp.c +++ b/ldso/ldso/m68k/elfinterp.c @@ -184,9 +184,10 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,  			_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", _dl_progname, symname);  			_dl_exit(1);  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  						&sym_ref, elf_machine_type_class(reloc_type)); +		}  	}  #if defined (__SUPPORT_LD_DEBUG__) diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c index 159e59d33..b748839ce 100644 --- a/ldso/ldso/mips/elfinterp.c +++ b/ldso/ldso/mips/elfinterp.c @@ -193,9 +193,10 @@ int _dl_parse_relocation_information(struct dyn_elf *xpnt,  								   elf_machine_type_class(reloc_type), &sym_ref);  			if (unlikely(!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK))  				return 1; -			if (_dl_trace_prelink) +			if (_dl_trace_prelink) {  				_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  							&sym_ref, elf_machine_type_class(reloc_type)); +			}  		}  		if (!symtab_index) {  			/* Relocs against STN_UNDEF are usually treated as using a diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c index 78085ecb0..507913035 100644 --- a/ldso/ldso/powerpc/elfinterp.c +++ b/ldso/ldso/powerpc/elfinterp.c @@ -215,9 +215,10 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct r_scope_elem *scope,  			&& (ELF32_ST_TYPE(sym_ref.sym->st_info) != STT_TLS  				&& ELF32_ST_BIND(sym_ref.sym->st_info) != STB_WEAK)))  			return 1; -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  						&sym_ref, elf_machine_type_class(reloc_type)); +		}  		tls_tpnt = sym_ref.tpnt;  	} else {  		symbol_addr = sym_ref.sym->st_value; diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c index 293bfe31e..da55b6a3a 100644 --- a/ldso/ldso/sh/elfinterp.c +++ b/ldso/ldso/sh/elfinterp.c @@ -189,9 +189,10 @@ _dl_do_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,  			/* Let the caller to handle the error: it may be non fatal if called from dlopen */  			return 1;  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  							&sym_ref, elf_machine_type_class(reloc_type)); +		}  		tls_tpnt = sym_ref.tpnt;  	} diff --git a/ldso/ldso/sh64/elfinterp.c b/ldso/ldso/sh64/elfinterp.c index caf9f0e14..0d16f6b9d 100644 --- a/ldso/ldso/sh64/elfinterp.c +++ b/ldso/ldso/sh64/elfinterp.c @@ -203,9 +203,10 @@ static int _dl_do_reloc(struct elf_resolve *tpnt,struct r_scope_elem *scope,  				     _dl_progname, symname);  			_dl_exit (1);  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  				&sym_ref, elf_machine_type_class(reloc_type)); +		}  	}  #ifdef __SUPPORT_LD_DEBUG__ diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c index 60a0161be..e3f0e470a 100644 --- a/ldso/ldso/sparc/elfinterp.c +++ b/ldso/ldso/sparc/elfinterp.c @@ -200,9 +200,10 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,  			return 1;  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  						&sym_ref, elf_machine_type_class(reloc_type)); +		}  		tls_tpnt = sym_ref.tpnt;  	} else {  		/* Relocs against STN_UNDEF are usually treated as using a diff --git a/ldso/ldso/x86_64/elfinterp.c b/ldso/ldso/x86_64/elfinterp.c index d8b38d3fd..75666a799 100644 --- a/ldso/ldso/x86_64/elfinterp.c +++ b/ldso/ldso/x86_64/elfinterp.c @@ -188,9 +188,10 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,  			/* This may be non-fatal if called from dlopen. */  			return 1;  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  						&sym_ref, elf_machine_type_class(reloc_type)); +		}  #if defined USE_TLS && USE_TLS  		tls_tpnt = sym_ref.tpnt;  #endif diff --git a/ldso/ldso/xtensa/elfinterp.c b/ldso/ldso/xtensa/elfinterp.c index 93edc1ff2..23d1eb17c 100644 --- a/ldso/ldso/xtensa/elfinterp.c +++ b/ldso/ldso/xtensa/elfinterp.c @@ -177,9 +177,10 @@ _dl_do_reloc (struct elf_resolve *tpnt, struct r_scope_elem *scope,  						 _dl_progname, symname);  			_dl_exit (1);  		} -		if (_dl_trace_prelink) +		if (_dl_trace_prelink) {  			_dl_debug_lookup (symname, tpnt, &symtab[symtab_index],  						&sym_ref, elf_machine_type_class(reloc_type)); +		}  	}  #if defined (__SUPPORT_LD_DEBUG__)  | 
