Re: elfutils import

[Sami Wagiaalla <swagiaal@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

Roland McGrath wrote:
> That diff was really not useful.  Please post the diff between what you
> have in the frysk tree and the corresponding vanilla elfutils source.
>   
Roland,

My mistake. This branch (sami-elfutils_129-merge-20070827-branch) now 
contains the vanila elfutils sources plus frysk changes to elfutils. I 
attached a diff showing thos changes.

Sami

[-- Attachment #2: frysk_changes --]
[-- Type: text/plain, Size: 6902 bytes --]

Index: ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/ChangeLog,v
retrieving revision 1.1.1.3
retrieving revision 1.16.2.3
diff -u -r1.1.1.3 -r1.16.2.3
--- ChangeLog	22 Aug 2007 17:18:47 -0000	1.1.1.3
+++ ChangeLog	29 Aug 2007 17:13:51 -0000	1.16.2.3
@@ -4,6 +4,10 @@
 	* configure.ac: Don't use libelf-po/POTFILES.in as config file
 	anymore.
 
+2007-05-28  Nurdin Premji  <npremji@redhat.com>
+ 
+	* libdwfl/libdwfl.h: Publicize elf_from_remote_memory.
+
 2007-05-16  Roland McGrath  <roland@redhat.com>
 
 	* configure.ac (AM_INIT_AUTOMAKE): Use -Wno-portability.
@@ -16,6 +20,11 @@
 
 	* configure.ac: Use AM_MAINTAINER_MODE.
 
+2006-08-19  Stepan Kasal  <skasal@redhat.com>
+ 
+	* Makefile.am: Do not run installcheck nor uninstall either.
+	Do not define all targets on one line, attach explanation.
+ 
 2006-07-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* configure.ac (internal_function): Don't use internal visibility.
@@ -25,6 +34,10 @@
 	* configure.ac: Add dummy automake conditional to get dependencies
 	for non-generic linker right.  See src/Makefile.am.
 
+2006-06-27  Rick Moseley  <rmoseley@redhat.com>
+	
+	* Makefile.am: Change to not install for frysk.
+	
 2005-11-18  Roland McGrath  <roland@redhat.com>
 
 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
Index: Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/Makefile.am,v
retrieving revision 1.1.1.3
retrieving revision 1.8.2.3
diff -u -r1.1.1.3 -r1.8.2.3
--- Makefile.am	22 Aug 2007 17:18:53 -0000	1.1.1.3
+++ Makefile.am	29 Aug 2007 17:13:51 -0000	1.8.2.3
@@ -31,7 +31,7 @@
 SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
 	  src po tests
 
-EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION
+EXTRA_DIST = elfutils.spec GPG-KEY NOTES
 
 # Make sure the test install uses lib64 when $LIB will yield lib64.
 # Make sure the test build uses the same compiler, which on e.g. ppc64
@@ -46,6 +46,15 @@
 rpm: dist
 	rpmbuild -ts --sign elfutils-@PACKAGE_VERSION@.tar.gz
 
+# Do not install the copy embedded in frysk:
+## (We cannot put all targets to one line, Automake would not understand.)
+install:
+	: Do not run $@ in elfutils.
+uninstall:
+	: Do not run $@ in elfutils.
+installcheck:
+	: Do not run $@ in elfutils.
+
 # Tell version 3.79 and up of GNU make to not build goals in this
 # directory in parallel.
 .NOTPARALLEL:
Index: backends/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/backends/ChangeLog,v
retrieving revision 1.1.1.5
retrieving revision 1.11.2.3
diff -u -r1.1.1.5 -r1.11.2.3
--- backends/ChangeLog	22 Aug 2007 17:20:05 -0000	1.1.1.5
+++ backends/ChangeLog	29 Aug 2007 17:13:51 -0000	1.11.2.3
@@ -65,6 +65,11 @@
 	need static object for anything here.  This rule is the only source of
 	.deps/ files.
 
+2006-06-23  Stepan Kasal  <kasal@ucw.cz>
+	
+	* Makefile.am: Work around a bug in GNU make -jN by mentioning *.map.
+	* Makefile.am: Mention the *.o files.
+	
 2006-06-23  Stepan Kasal  <skasal@redhat.com>
 
 	* Makefile.am (PACKAGE_VERSION): Remove superfluous definition.
Index: backends/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/backends/Makefile.am,v
retrieving revision 1.1.1.3
retrieving revision 1.9.2.3
diff -u -r1.1.1.3 -r1.9.2.3
--- backends/Makefile.am	22 Aug 2007 17:20:07 -0000	1.1.1.3
+++ backends/Makefile.am	29 Aug 2007 17:13:51 -0000	1.9.2.3
@@ -45,6 +45,8 @@
 noinst_LIBRARIES = $(libebl_pic)
 noinst_DATA = $(libebl_pic:_pic.a=.so)
 
+# Workaround a bug in GNU make -jN:
+non-intermediate-maps: $(libebl_pic:_pic.a=.map)
 
 if MUDFLAP
 libelf = ../libelf/libelf.a
@@ -119,6 +121,14 @@
 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 	fi
 
+# The *.o files are deleted at the end of the first run (they are
+# intermediate) and rebuilt in the second one (they get mentioned in
+# autogenerated dependencies).  To avoid this, mention them here:
+# (It seems this makefile does not try to be portable, so the GNU extensions
+# can be used here, too.)
+non-intermediate-objects: $(foreach m,$(modules),$($(m)_SRCS:.c=.o))
+
+
 install: install-am install-ebl-modules
 install-ebl-modules:
 	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(LIBEBL_SUBDIR)
Index: libdwfl/libdwfl.h
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/libdwfl/libdwfl.h,v
retrieving revision 1.1.1.4
retrieving revision 1.11.2.2
diff -u -r1.1.1.4 -r1.11.2.2
--- libdwfl/libdwfl.h	26 Apr 2007 17:20:53 -0000	1.1.1.4
+++ libdwfl/libdwfl.h	29 Aug 2007 17:13:51 -0000	1.11.2.2
@@ -455,6 +455,15 @@
 							const char *regname,
 							int bits, int type),
 				       void *arg);
+				       
+extern Elf *elf_from_remote_memory (GElf_Addr ehdr_vma,
+				    GElf_Addr *loadbasep,
+				    ssize_t (*read_memory) (void *arg,
+							    void *data,
+							    GElf_Addr address,
+							    size_t minread,
+							    size_t maxread),
+				    void *arg);				       
 
 
 #ifdef __cplusplus
Index: tests/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/tests/ChangeLog,v
retrieving revision 1.1.1.5
retrieving revision 1.19.2.3
diff -u -r1.1.1.5 -r1.19.2.3
--- tests/ChangeLog	22 Aug 2007 17:19:06 -0000	1.1.1.5
+++ tests/ChangeLog	29 Aug 2007 17:13:51 -0000	1.19.2.3
@@ -174,6 +174,10 @@
 	* allregs.c (struct reginfo): Increase size of name.
 	(one_register): Assert that it's big enough.
 
+2006-06-23  Stepan Kasal  <kasal@ucw.cz>
+	
+	* line2addr.c (main): Avoid using sscanf() to prevent a warning.
+ 
 2006-04-04  Roland McGrath  <roland@redhat.com>
 
 	* run-bug1-test.sh: Test a second case, to cover both byte orders.
Index: tests/line2addr.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/tests/line2addr.c,v
retrieving revision 1.1.1.1
retrieving revision 1.7.2.2
diff -u -r1.1.1.1 -r1.7.2.2
--- tests/line2addr.c	8 May 2006 20:48:53 -0000	1.1.1.1
+++ tests/line2addr.c	29 Aug 2007 17:13:51 -0000	1.7.2.2
@@ -131,19 +131,18 @@
   for (; cnt < argc; ++cnt)
     {
       struct args a = { .arg = argv[cnt] };
+      char *c = strchr (a.arg, ':');
 
-      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
-	{
-	default:
-	case 0:
-	  printf ("ignored %s\n", argv[cnt]);
-	  continue;
-	case 1:
-	  a.line = 0;
-	  break;
-	case 2:
-	  break;
-	}
+      if (a.arg == NULL) {
+	printf ("ignored %s\n", a.arg);
+	continue;
+      } else if (c == NULL) {
+	a.file = strdup (a.arg);
+	a.line = 0;
+      } else {
+	a.file = strndup (a.arg, c - a.arg);
+	a.line = strtol (c + 1, NULL, 10);
+      }
 
       (void) dwfl_getdwarf (dwfl, &handle_module, &a, 0);