This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-771-g3e2e43e
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Nov 2012 20:01:10 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-771-g3e2e43e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 3e2e43e2504b5dd2768afc0f8b6de77849f5a376 (commit)
via 9205a9917621c0ea7d1ae6e3142b491b1f99008f (commit)
from 6706074627da7734d21f0024b6f7fb58b5629d6b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3e2e43e2504b5dd2768afc0f8b6de77849f5a376
commit 3e2e43e2504b5dd2768afc0f8b6de77849f5a376
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri Nov 23 22:23:38 2012 +0100
m68k/cf: fix copying frame in _dl_runtime_profile
diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 00830ee..853351f 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,5 +1,8 @@
2012-11-23 Andreas Schwab <schwab@linux-m68k.org>
+ * sysdeps/m68k/dl-trampoline.S (_dl_runtime_profile)
+ [__mcoldfire__]: Fix copying loop.
+
* sysdeps/m68k/sotruss-lib.c: New file.
2012-11-21 Andreas Schwab <schwab@linux-m68k.org>
diff --git a/ports/sysdeps/m68k/dl-trampoline.S b/ports/sysdeps/m68k/dl-trampoline.S
index fad1864..dec335e 100644
--- a/ports/sysdeps/m68k/dl-trampoline.S
+++ b/ports/sysdeps/m68k/dl-trampoline.S
@@ -130,7 +130,7 @@ _dl_runtime_profile:
#ifdef __mcoldfire__
tst.l %d1
beq 2f
-1: move.l (%a0)+, (%a1)+
+1: move.l (%a1)+, (%a0)+
subq.l #4,%d1
bne 1b
2:
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9205a9917621c0ea7d1ae6e3142b491b1f99008f
commit 9205a9917621c0ea7d1ae6e3142b491b1f99008f
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri Nov 23 17:30:33 2012 +0100
m68k: add sotruss-lib.c
diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index e169402..00830ee 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,7 @@
+2012-11-23 Andreas Schwab <schwab@linux-m68k.org>
+
+ * sysdeps/m68k/sotruss-lib.c: New file.
+
2012-11-21 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
diff --git a/ports/sysdeps/m68k/sotruss-lib.c b/ports/sysdeps/m68k/sotruss-lib.c
new file mode 100644
index 0000000..6c9e552
--- /dev/null
+++ b/ports/sysdeps/m68k/sotruss-lib.c
@@ -0,0 +1,51 @@
+/* Override generic sotruss-lib.c to define actual functions for m68k.
+ Copyright (C) 2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#define HAVE_ARCH_PLTENTER
+#define HAVE_ARCH_PLTEXIT
+
+#include <elf/sotruss-lib.c>
+
+ElfW(Addr)
+la_m68k_gnu_pltenter (Elf32_Sym *sym __attribute__ ((unused)),
+ unsigned int ndx __attribute__ ((unused)),
+ uintptr_t *refcook, uintptr_t *defcook,
+ La_m68k_regs *regs, unsigned int *flags,
+ const char *symname, long int *framesizep)
+{
+ unsigned long int *sp = (unsigned long int *) regs->lr_sp;
+
+ print_enter (refcook, defcook, symname, sp[1], sp[2], sp[3], *flags);
+
+ /* No need to copy anything, we will not need the parameters in any case. */
+ *framesizep = 0;
+
+ return sym->st_value;
+}
+
+unsigned int
+la_m68k_gnu_pltexit (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook,
+ uintptr_t *defcook,
+ const struct La_m68k_regs *inregs,
+ struct La_m68k_retval *outregs,
+ const char *symname)
+{
+ print_exit (refcook, defcook, symname, outregs->lrv_d0);
+
+ return 0;
+}
-----------------------------------------------------------------------
Summary of changes:
ports/ChangeLog.m68k | 7 +++++++
ports/sysdeps/m68k/dl-trampoline.S | 2 +-
ports/sysdeps/{tile => m68k}/sotruss-lib.c | 22 ++++++++++++----------
3 files changed, 20 insertions(+), 11 deletions(-)
copy ports/sysdeps/{tile => m68k}/sotruss-lib.c (71%)
hooks/post-receive
--
GNU C Library master sources