public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: Merge branch 'master' of git://sourceware.org/git/frysk
@ 2007-11-22 13:41 mark
0 siblings, 0 replies; only message in thread
From: mark @ 2007-11-22 13:41 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via e968bea4004ca57402fc394bfa30edbf82756362 (commit)
via 7bac227a0595411ff3e883939fcd30d6ab831e9b (commit)
via 61307753916c524ccff305032b4c0ee45643eaea (commit)
from adc15992c27aee3dc62efd09149a9c930f41a4a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit e968bea4004ca57402fc394bfa30edbf82756362
Merge: 7bac227a0595411ff3e883939fcd30d6ab831e9b adc15992c27aee3dc62efd09149a9c930f41a4a2
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Thu Nov 22 14:39:07 2007 +0100
Merge branch 'master' of git://sourceware.org/git/frysk
commit 7bac227a0595411ff3e883939fcd30d6ab831e9b
Merge: 77939fcf72c66c6891797c90a0e4a19ec9e013e4 61307753916c524ccff305032b4c0ee45643eaea
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Thu Nov 22 14:26:09 2007 +0100
Merge branch 'vendor/LIBUNWIND'
Conflicts:
frysk-imports/libunwind/config/mkinstalldirs
frysk-imports/libunwind/configure
frysk-imports/libunwind/configure.in
frysk-imports/libunwind/src/ia64/Ginit.c
frysk-imports/libunwind/src/mi/init.c
-----------------------------------------------------------------------
Summary of changes:
frysk-imports/libunwind/AUTHORS | 2 +-
frysk-imports/libunwind/NEWS | 4 ++++
frysk-imports/libunwind/README | 18 ++++++++----------
frysk-imports/libunwind/src/ia64/Ginit.c | 6 ------
frysk-imports/libunwind/src/mi/init.c | 2 +-
frysk-imports/libunwind/src/os-linux.h | 4 ++--
6 files changed, 16 insertions(+), 20 deletions(-)
mode change 100644 => 100755 frysk-imports/libunwind/scripts/kernel-diff.sh
mode change 100644 => 100755 frysk-imports/libunwind/scripts/make-L-files
mode change 100755 => 100644 frysk-imports/libunwind/tests/check-namespace.sh.in
First 500 lines of diff:
diff --git a/frysk-imports/libunwind/AUTHORS b/frysk-imports/libunwind/AUTHORS
index 912a7d9..719eee5 100644
--- a/frysk-imports/libunwind/AUTHORS
+++ b/frysk-imports/libunwind/AUTHORS
@@ -1 +1 @@
-David Mosberger <davidm@hpl.hp.com>
+David Mosberger <dmosberger@gmail.org>
diff --git a/frysk-imports/libunwind/NEWS b/frysk-imports/libunwind/NEWS
index 7498694..83ac810 100644
--- a/frysk-imports/libunwind/NEWS
+++ b/frysk-imports/libunwind/NEWS
@@ -8,6 +8,10 @@
* News for v0.98.6:
** Fix address-leak triggered by invalid byte-order. Fixed by Andreas Schwab.
+** On ia64, get_static_proc_name() no longer uses a weak reference to
+ _Uelf64_get_proc_name(), since that was causing problems with archive
+ libraries and no longer served any apparent purpose. Fixed by
+ Curt Wohlgemuth.
* News for v0.98.5:
diff --git a/frysk-imports/libunwind/README b/frysk-imports/libunwind/README
index 7a33afd..180edd2 100644
--- a/frysk-imports/libunwind/README
+++ b/frysk-imports/libunwind/README
@@ -187,16 +187,14 @@ commands:
Please direct all questions regarding this library to:
- libunwind@linux.hpl.hp.com
+ libunwind-devel@nongnu.org
-For spam protection, you'll have to subscribe to this list before
-posting a question. You can do this by sending a mail to
-libunwind-request@linux.hpl.hp.com with a body of:
+You can do this by sending a mail to libunwind-request@nongnu.org with
+a body of:
- subscribe libunwind
+ subscribe libunwind-devel
-Note: the host that is running this list is behind a firewall, so
-you'll not be able to use the Web interface to manage your
-subscription. Send a mail containing "help" to
-libunwind-request@linux.hpl.hp.com for information on how to manage
-your subscription via email.
+or you can subscribe and manage your subscription via the
+web-interface at:
+
+ https://savannah.nongnu.org/mail/?group=libunwind
diff --git a/frysk-imports/libunwind/scripts/kernel-diff.sh b/frysk-imports/libunwind/scripts/kernel-diff.sh
old mode 100644
new mode 100755
diff --git a/frysk-imports/libunwind/scripts/make-L-files b/frysk-imports/libunwind/scripts/make-L-files
old mode 100644
new mode 100755
diff --git a/frysk-imports/libunwind/src/ia64/Ginit.c b/frysk-imports/libunwind/src/ia64/Ginit.c
index 010a23e..3c5f7ad 100644
--- a/frysk-imports/libunwind/src/ia64/Ginit.c
+++ b/frysk-imports/libunwind/src/ia64/Ginit.c
@@ -348,13 +348,7 @@ get_static_proc_name (unw_addr_space_t as, unw_word_t ip,
char *buf, size_t buf_len, unw_word_t *offp,
void *arg)
{
-#ifndef _UNW_LOCAL_ONLY
-# pragma weak _Uelf64_get_proc_name
- if (!_Uelf64_get_proc_name)
- return -UNW_EINVAL;
-#endif
return _Uelf64_get_proc_name (as, getpid (), ip, buf, buf_len, offp, arg);
- return _Uelf64_get_proc_name (as, getpid (), ip, buf, buf_len, offp);
}
HIDDEN void
diff --git a/frysk-imports/libunwind/src/mi/init.c b/frysk-imports/libunwind/src/mi/init.c
index b49aa9a..4bf97c4 100644
--- a/frysk-imports/libunwind/src/mi/init.c
+++ b/frysk-imports/libunwind/src/mi/init.c
@@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
HIDDEN intrmask_t unwi_full_mask;
static const char rcsid[] UNUSED =
- "$Id: init.c,v 1.4 2007/10/11 11:21:43 mark Exp $";
+ "$Id: " PACKAGE_STRING " --- report bugs to " PACKAGE_BUGREPORT " $";
#if UNW_DEBUG
diff --git a/frysk-imports/libunwind/src/os-linux.h b/frysk-imports/libunwind/src/os-linux.h
index cc36bf7..dba788e 100644
--- a/frysk-imports/libunwind/src/os-linux.h
+++ b/frysk-imports/libunwind/src/os-linux.h
@@ -228,7 +228,7 @@ maps_next (struct map_iterator *mi,
{
/* copy down the remaining bytes, if any */
if (bytes_left > 0)
- memcpy (mi->buf_end - mi->buf_size, mi->buf, bytes_left);
+ memmove (mi->buf_end - mi->buf_size, mi->buf, bytes_left);
mi->buf = mi->buf_end - mi->buf_size;
nread = read (mi->fd, mi->buf + bytes_left,
@@ -240,7 +240,7 @@ maps_next (struct map_iterator *mi,
/* Move contents to the end of the buffer so we
maintain the invariant that all bytes between
mi->buf and mi->buf_end are valid. */
- memcpy (mi->buf_end - nread - bytes_left, mi->buf,
+ memmove (mi->buf_end - nread - bytes_left, mi->buf,
nread + bytes_left);
mi->buf = mi->buf_end - nread - bytes_left;
}
diff --git a/frysk-imports/libunwind/tests/check-namespace.sh.in b/frysk-imports/libunwind/tests/check-namespace.sh.in
old mode 100755
new mode 100644
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-11-22 13:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-22 13:41 [SCM] master: Merge branch 'master' of git://sourceware.org/git/frysk mark
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).