[PATCH] ldso: ARC fixlets (fallouts of Bernhard's review)

Vineet Gupta Vineet.Gupta1 at synopsys.com
Fri Dec 20 14:14:47 UTC 2013


Signed-off-by: Vineet Gupta <vgupta at synopsys.com>
---
 ldso/ldso/arc/dl-startup.h  | 2 +-
 ldso/ldso/arc/dl-syscalls.h | 2 ++
 ldso/ldso/arc/dl-sysdep.h   | 2 +-
 ldso/ldso/arc/elfinterp.c   | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ldso/ldso/arc/dl-startup.h b/ldso/ldso/arc/dl-startup.h
index 4a8d5d786b63..016155473423 100644
--- a/ldso/ldso/arc/dl-startup.h
+++ b/ldso/ldso/arc/dl-startup.h
@@ -31,7 +31,7 @@ __asm__(
     "   mov_s   r0, sp          ; pass ptr to aux vector tbl    \n"
 
     "   ; If ldso ran as cmd with executable file nm as arg     \n"
-    "   ; as arg, skip the extra args calc by dl_start()        \n"
+    "   ; skip the extra args calc by dl_start()                \n"
     "   ld_s    r1, [sp]       ; orig argc from aux-vec Tbl     \n"
 #ifdef STAR_9000535888_FIXED
     "   ld      r12, [pcl, _dl_skip_args-.+(.&2)]               \n"
diff --git a/ldso/ldso/arc/dl-syscalls.h b/ldso/ldso/arc/dl-syscalls.h
index a0b5afc9ec78..a3cbb011b555 100644
--- a/ldso/ldso/arc/dl-syscalls.h
+++ b/ldso/ldso/arc/dl-syscalls.h
@@ -3,3 +3,5 @@
  *
  * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
  */
+
+/* stub for arch-specific syscall issues */
diff --git a/ldso/ldso/arc/dl-sysdep.h b/ldso/ldso/arc/dl-sysdep.h
index dfde3323373b..6e2e47c0d29c 100644
--- a/ldso/ldso/arc/dl-sysdep.h
+++ b/ldso/ldso/arc/dl-sysdep.h
@@ -87,7 +87,7 @@ extern unsigned __udivmodsi4(unsigned, unsigned) attribute_hidden;
 	__extension__ ({						\
 		register unsigned r1 __asm__ ("r1") = (base);		\
 									\
-		__asm("bl.d @__udivmodsi4` mov r0,%1"			\
+		__asm__("bl.d @__udivmodsi4` mov r0,%1"			\
 		: "=r" (r1)						\
 	        : "r" (n), "r" (r1)					\
 	        : "r0", "r2", "r3", "r4", "lp_count", "blink", "cc");	\
diff --git a/ldso/ldso/arc/elfinterp.c b/ldso/ldso/arc/elfinterp.c
index a3d741b65c4e..1d4481c6ff05 100644
--- a/ldso/ldso/arc/elfinterp.c
+++ b/ldso/ldso/arc/elfinterp.c
@@ -148,7 +148,7 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,
 
 log_entry:
 #if defined __SUPPORT_LD_DEBUG__
-	if(_dl_debug_detail)
+	if (_dl_debug_detail)
 		_dl_dprintf(_dl_debug_file,"\tpatched: %lx ==> %lx @ %pl: addend %x ",
 				old_val, *reloc_addr, reloc_addr, rpnt->r_addend);
 #endif
@@ -263,7 +263,7 @@ _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
 	 * On ARC, the loadaddr of dyn exec is zero, thus elfaddr == loadaddr
 	 * Thus there is no point in adding "0" to values and un-necessarily
 	 * stir up the caches and TLB.
-	 * For lsdo processing busybox binary, this skips over 380 relo entries
+	 * For ldso processing busybox binary, this skips over 380 relo entries
 	 */
 	if (rpnt->dyn->loadaddr != 0)
 		_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, ___DO_LAZY);
-- 
1.8.1.2



More information about the uClibc mailing list