[Commits] r21870 - in /fsf/trunk/libc: ./ ports/ ports/sysdeps/m68k/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Nov 26 00:01:39 2012
New Revision: 21870

Log:
Import glibc-mainline for 2012-11-26

Added:
    fsf/trunk/libc/ports/sysdeps/m68k/sotruss-lib.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/configure
    fsf/trunk/libc/configure.in
    fsf/trunk/libc/ports/ChangeLog.m68k
    fsf/trunk/libc/ports/sysdeps/m68k/dl-trampoline.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Nov 26 00:01:39 2012
@@ -1,3 +1,8 @@
+2012-11-24  Adam Conrad  <adconrad@xxxxxxx>
+
+	* configure.in: Autodetect C++ header directories.
+	* configure: Regenerated.
+
 2012-11-23  Mike Frysinger  <vapier@xxxxxxxxxx>
 
 	* elf/Makefile ($(objpfx)ld.so): Change readelf to $(READELF).

Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Mon Nov 26 00:01:39 2012
@@ -5423,12 +5423,11 @@
 -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
   if test -n "$CXX"; then
     CXX_SYSINCLUDES=
-    cxxmachine=`$CXX -dumpmachine 2>&5` &&
-    cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
-	| sed -n -e '1,/#include/d' -e '/^ \//{p;q;}' | sed 's/ //'`
-    test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
-    CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
--isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
+    for cxxheaders in `$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
+    | sed -n -e '1,/#include/d' -e 's/^ \(\/.*\/[cg]++\)/\1/p'`; do
+      test "x$cxxheaders" != x &&
+      CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders"
+    done
   fi
 fi
 

Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Mon Nov 26 00:01:39 2012
@@ -995,12 +995,11 @@
 -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
   if test -n "$CXX"; then
     CXX_SYSINCLUDES=
-    cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
-    cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
-	| sed -n -e '1,/#include/d' -e '/^ \//{p;q;}' | sed 's/ //'`
-    test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
-    CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
--isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
+    for cxxheaders in `$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
+    | sed -n -e '1,/#include/d' -e 's/^ \(\/.*\/[cg]++\)/\1/p'`; do
+      test "x$cxxheaders" != x &&
+      CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders"
+    done
   fi
 fi
 AC_SUBST(SYSINCLUDES)

Modified: fsf/trunk/libc/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.m68k (original)
+++ fsf/trunk/libc/ports/ChangeLog.m68k Mon Nov 26 00:01:39 2012
@@ -1,3 +1,10 @@
+2012-11-23  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* 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@xxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h

Modified: fsf/trunk/libc/ports/sysdeps/m68k/dl-trampoline.S
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/m68k/dl-trampoline.S (original)
+++ fsf/trunk/libc/ports/sysdeps/m68k/dl-trampoline.S Mon Nov 26 00:01:39 2012
@@ -130,7 +130,7 @@
 #ifdef __mcoldfire__
 	tst.l %d1
 	beq 2f
-1:	move.l (%a0)+, (%a1)+
+1:	move.l (%a1)+, (%a0)+
 	subq.l #4,%d1
 	bne 1b
 2:

Added: fsf/trunk/libc/ports/sysdeps/m68k/sotruss-lib.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/m68k/sotruss-lib.c (added)
+++ fsf/trunk/libc/ports/sysdeps/m68k/sotruss-lib.c Mon Nov 26 00:01:39 2012
@@ -1,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;
+}

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits