[Ltrace-devel] r66 - in ltrace/trunk: . sysdeps/linux-gnu/ia64 sysdeps/linux-gnu/ppc

[Ian Wienand]

Author: ianw-guest
Date: 2006-09-14 23:57:49 +0000 (Thu, 14 Sep 2006)
New Revision: 66

Modified:
   ltrace/trunk/ChangeLog
   ltrace/trunk/Makefile.in
   ltrace/trunk/elf.c
   ltrace/trunk/summary.c
   ltrace/trunk/sysdeps/linux-gnu/ia64/regs.c
   ltrace/trunk/sysdeps/linux-gnu/ppc/plt.c
Log:
Apply range of updates from Olaf Hering, see ChangeLog



Modified: ltrace/trunk/ChangeLog
===================================================================
--- ltrace/trunk/ChangeLog	2006-08-14 03:42:30 UTC (rev 65)
+++ ltrace/trunk/ChangeLog	2006-09-14 23:57:49 UTC (rev 66)
@@ -1,3 +1,13 @@
+2006-09-15  Olaf Hering <olh at suse.de>
+
+	* Makefile.in : allow installation as non-root user, print out
+	some debugging information before running test suite.
+	* summary.c : allow compilation without USE_DEMANGLE
+	* sysdeps/linux-gnu/ppc/plt.c : fix warning in sym2addr
+	* sysdeps/linux-gnu/ia64/regs.c : fix warning when finding
+	instruction slot
+	* elf.c : fix up error created in 2006-07-26 refactor
+
 2006-08-14  Steve Fink <sphink at gmail.com>
 
 	* demangle.c: remove my_demagle_dict_clear(), remove atexit() call

Modified: ltrace/trunk/Makefile.in
===================================================================
--- ltrace/trunk/Makefile.in	2006-08-14 03:42:30 UTC (rev 65)
+++ ltrace/trunk/Makefile.in	2006-09-14 23:57:49 UTC (rev 66)
@@ -20,10 +20,10 @@
 LIBS		=	@LIBS@
 
 INSTALL		=	@INSTALL@
-INSTALL_FILE	=	$(INSTALL) -p    -o root -g root  -m  644
-INSTALL_PROGRAM	=	$(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT	=	$(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR	=	$(INSTALL) -p -d -o root -g root  -m  755
+INSTALL_FILE	=	$(INSTALL) -p    -m  644
+INSTALL_PROGRAM	=	$(INSTALL) -p    -m  755
+INSTALL_SCRIPT	=	$(INSTALL) -p    -m  755
+INSTALL_DIR	=	$(INSTALL) -p -d -m  755
 
 OBJ	=	ltrace.o options.o elf.o output.o read_config_file.o	\
 		execute_program.o wait_for_something.o process_event.o	\
@@ -81,7 +81,7 @@
 		$(INSTALL_FILE) ltrace.1 $(DESTDIR)$(mandir)/man1
 
 check:
-		cd testsuite; $(MAKE) check
+		cd testsuite;cat /proc/version;uptime;free -m;$(MAKE) check
 
 dummy:
 

Modified: ltrace/trunk/elf.c
===================================================================
--- ltrace/trunk/elf.c	2006-08-14 03:42:30 UTC (rev 65)
+++ ltrace/trunk/elf.c	2006-09-14 23:57:49 UTC (rev 66)
@@ -417,7 +417,7 @@
 	if (offset > lte->opd_size)
 		error(EXIT_FAILURE, 0, "static plt not in .opd");
 
-	return (GElf_Addr)(base + offset);
+	return *(GElf_Addr*)(base + offset);
 }
 
 struct library_symbol *read_elf(struct process *proc)

Modified: ltrace/trunk/summary.c
===================================================================
--- ltrace/trunk/summary.c	2006-08-14 03:42:30 UTC (rev 65)
+++ ltrace/trunk/summary.c	2006-09-14 23:57:49 UTC (rev 66)
@@ -83,7 +83,10 @@
 		       (int)entries[i].tv.tv_sec, (int)entries[i].tv.tv_usec,
 		       (unsigned long int)(c / entries[i].count),
 		       entries[i].count,
-		       opt_C ? my_demangle(entries[i].name) : entries[i].name);
+#ifdef USE_DEMANGLE
+		       opt_C ? my_demangle(entries[i].name) :
+#endif
+		       entries[i].name);
 	}
 	printf
 	    ("------ ----------- ----------- --------- --------------------\n");

Modified: ltrace/trunk/sysdeps/linux-gnu/ia64/regs.c
===================================================================
--- ltrace/trunk/sysdeps/linux-gnu/ia64/regs.c	2006-08-14 03:42:30 UTC (rev 65)
+++ ltrace/trunk/sysdeps/linux-gnu/ia64/regs.c	2006-09-14 23:57:49 UTC (rev 66)
@@ -25,11 +25,11 @@
 {
 
 	unsigned long newip = (unsigned long)addr;
-	int slot = (int)addr & 0xf;
+	unsigned long slot = (unsigned long)addr & 0xf;
 	unsigned long psr = ptrace(PTRACE_PEEKUSER, proc->pid, PT_CR_IPSR, 0);
 
 	psr &= ~(3UL << 41);
-	psr |= (unsigned long)(slot & 0x3) << 41;
+	psr |= (slot & 0x3) << 41;
 
 	newip &= ~0xfUL;
 

Modified: ltrace/trunk/sysdeps/linux-gnu/ppc/plt.c
===================================================================
--- ltrace/trunk/sysdeps/linux-gnu/ppc/plt.c	2006-08-14 03:42:30 UTC (rev 65)
+++ ltrace/trunk/sysdeps/linux-gnu/ppc/plt.c	2006-09-14 23:57:49 UTC (rev 66)
@@ -12,7 +12,7 @@
 
 void *sym2addr(struct process *proc, struct library_symbol *sym)
 {
-	long addr = sym->enter_addr;
+	void *addr = sym->enter_addr;
 	long pt_ret;
 
 	debug(3, 0);