[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r23408 - in /fsf/trunk/libc/ports: ./ sysdeps/m68k/ sysdeps/tile/

To: commits@xxxxxxxxxx
Subject: [Commits] r23408 - in /fsf/trunk/libc/ports: ./ sysdeps/m68k/ sysdeps/tile/
From: eglibc@xxxxxxxxxx
Date: Mon, 01 Jul 2013 00:01:57 -0000
Author: eglibc
Date: Mon Jul  1 00:01:55 2013
New Revision: 23408

Log:
Import glibc-mainline for 2013-07-01

Removed:
    fsf/trunk/libc/ports/sysdeps/tile/fegetenv.c
    fsf/trunk/libc/ports/sysdeps/tile/fegetround.c
    fsf/trunk/libc/ports/sysdeps/tile/feholdexcpt.c
    fsf/trunk/libc/ports/sysdeps/tile/fesetenv.c
    fsf/trunk/libc/ports/sysdeps/tile/fesetround.c
    fsf/trunk/libc/ports/sysdeps/tile/feupdateenv.c
Modified:
    fsf/trunk/libc/ports/ChangeLog.m68k
    fsf/trunk/libc/ports/ChangeLog.tile
    fsf/trunk/libc/ports/sysdeps/m68k/dl-trampoline.S

Modified: fsf/trunk/libc/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.m68k (original)
+++ fsf/trunk/libc/ports/ChangeLog.m68k Mon Jul  1 00:01:55 2013
@@ -1,3 +1,11 @@
+2013-06-30  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/m68k/dl-trampoline.S (FMOVE): Define conditional on
+	[__mcoldfire__] and [__mcffpu__].
+	(FPSPACE): Likewise.
+	(_dl_runtime_profile): Save and restore %fp0 with FMOVE, only if
+	[FMOVE].  Use FPSPACE in stack offsets.
+
 2013-06-28  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/m68k/fpu_control.h: Fix preprocessor indentation.

Modified: fsf/trunk/libc/ports/ChangeLog.tile
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.tile (original)
+++ fsf/trunk/libc/ports/ChangeLog.tile Mon Jul  1 00:01:55 2013
@@ -1,3 +1,12 @@
+2013-06-28  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/tile/fegetenv.c: Delete now-redundant file.
+	* sysdeps/tile/fegetround.c: Likewise.
+	* sysdeps/tile/feholdexcpt.c: Likewise.
+	* sysdeps/tile/fesetenv.c: Likewise.
+	* sysdeps/tile/fesetround.c: Likewise.
+	* sysdeps/tile/feupdateenv.c: Likewise.
+
 2013-06-15  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libpthread.abilist:

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 Jul  1 00:01:55 2013
@@ -17,6 +17,16 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
+
+#if !defined (__mcoldfire__)
+# define FMOVE		fmove.x
+# define FPSPACE	12
+#elif defined (__mcffpu__)
+# define FMOVE		fmove.d
+# define FPSPACE	8
+#else
+# define FPSPACE	0
+#endif
 
 	.text
 	.globl _dl_runtime_resolve
@@ -174,12 +184,9 @@
 	    +4      %a1
 	   %sp      %a0
 	*/
-#ifdef __mcoldfire__
-	fmove.d %fp0, -(%sp)
-	cfi_adjust_cfa_offset (8)
-#else
-	fmove.x %fp0, -(%sp)
-	cfi_adjust_cfa_offset (12)
+#ifdef FMOVE
+	FMOVE %fp0, -(%sp)
+	cfi_adjust_cfa_offset (FPSPACE)
 #endif
 	move.l %a0, -(%sp)
 	cfi_adjust_cfa_offset (4)
@@ -189,21 +196,12 @@
 	cfi_adjust_cfa_offset (4)
 	pea (%sp)
 	cfi_adjust_cfa_offset (4)
-#ifdef __mcoldfire__
-	pea 24(%sp)
-	cfi_adjust_cfa_offset (4)
-	move.l 40(%sp), -(%sp)
-	cfi_adjust_cfa_offset (4)
-	move.l 40(%sp), -(%sp)
-	cfi_adjust_cfa_offset (4)
-#else
-	pea 28(%sp)
-	cfi_adjust_cfa_offset (4)
-	move.l 44(%sp), -(%sp)
-	cfi_adjust_cfa_offset (4)
-	move.l 44(%sp), -(%sp)
-	cfi_adjust_cfa_offset (4)
-#endif
+	pea (16+FPSPACE)(%sp)
+	cfi_adjust_cfa_offset (4)
+	move.l (32+FPSPACE)(%sp), -(%sp)
+	cfi_adjust_cfa_offset (4)
+	move.l (32+FPSPACE)(%sp), -(%sp)
+	cfi_adjust_cfa_offset (4)
 	jbsr _dl_call_pltexit
 	lea 16(%sp), %sp
 	cfi_adjust_cfa_offset (-16)
@@ -213,12 +211,9 @@
 	cfi_adjust_cfa_offset (-4)
 	move.l (%sp)+, %a0
 	cfi_adjust_cfa_offset (-4)
-#ifdef __mcoldfire__
-	fmove.d (%sp)+, %fp0
-	cfi_adjust_cfa_offset (-8)
-#else
-	fmove.x (%sp)+, %fp0
-	cfi_adjust_cfa_offset (-12)
+#ifdef FMOVE
+	FMOVE (%sp)+, %fp0
+	cfi_adjust_cfa_offset (-FPSPACE)
 #endif
 	lea 20(%sp), %sp
 	cfi_adjust_cfa_offset (-20)

Removed: fsf/trunk/libc/ports/sysdeps/tile/fegetenv.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/tile/fegetenv.c (original)
+++ fsf/trunk/libc/ports/sysdeps/tile/fegetenv.c (removed)
@@ -1,29 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
-   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/>.  */
-
-#include <fenv.h>
-#include <shlib-compat.h>
-
-int
-__fegetenv (fenv_t *envp)
-{
-  /* As a no-op, this always succeeds. */
-  return 0;
-}
-libm_hidden_ver (__fegetenv, fegetenv)
-versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);

Removed: fsf/trunk/libc/ports/sysdeps/tile/fegetround.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/tile/fegetround.c (original)
+++ fsf/trunk/libc/ports/sysdeps/tile/fegetround.c (removed)
@@ -1,25 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
-   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/>.  */
-
-#include <fenv.h>
-
-int
-fegetround (void)
-{
-  return FE_TONEAREST;
-}

Removed: fsf/trunk/libc/ports/sysdeps/tile/feholdexcpt.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/tile/feholdexcpt.c (original)
+++ fsf/trunk/libc/ports/sysdeps/tile/feholdexcpt.c (removed)
@@ -1,27 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
-   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/>.  */
-
-#include <fenv.h>
-
-/* Tile has no exception flags, so this routine can be a no-op.  */
-int
-feholdexcept (fenv_t *envp)
-{
-  return 0;
-}
-libm_hidden_def (feholdexcept)

Removed: fsf/trunk/libc/ports/sysdeps/tile/fesetenv.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/tile/fesetenv.c (original)
+++ fsf/trunk/libc/ports/sysdeps/tile/fesetenv.c (removed)
@@ -1,31 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
-   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/>.  */
-
-#include <fenv.h>
-#include <shlib-compat.h>
-
-/* The only way to get an initialized fenv_t on Tile is with feholdexcept()
-   or via FE_DFL_ENV, either of which restores the environment to its
-   normal state, i.e. FE_DFL_ENV.  */
-int
-__fesetenv (const fenv_t *envp)
-{
-  return 0;
-}
-libm_hidden_ver (__fesetenv, fesetenv)
-versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);

Removed: fsf/trunk/libc/ports/sysdeps/tile/fesetround.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/tile/fesetround.c (original)
+++ fsf/trunk/libc/ports/sysdeps/tile/fesetround.c (removed)
@@ -1,26 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
-   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/>.  */
-
-#include <fenv.h>
-
-int
-fesetround (int round)
-{
-  return (round == FE_TONEAREST) ? 0 : 1;
-}
-libm_hidden_def (fesetround)

Removed: fsf/trunk/libc/ports/sysdeps/tile/feupdateenv.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/tile/feupdateenv.c (original)
+++ fsf/trunk/libc/ports/sysdeps/tile/feupdateenv.c (removed)
@@ -1,27 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
-   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/>.  */
-
-#include <fenv.h>
-
-/* Tile has no exception flags, so this routine can be a no-op.  */
-int
-feupdateenv (const fenv_t *envp)
-{
-  return 0;
-}
-libm_hidden_def (feupdateenv)

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits
Prev by Date: [Commits] r23394 - in /fsf/trunk/libc: ./ dlfcn/ elf/ misc/ ports/ ports/sysdeps/aarch64/ ports/sysdeps/alpha/ ports/sysdeps/m68k/ por...
Next by Date: [Commits] r23422 - in /trunk: ./ libc/ libc/dlfcn/ libc/elf/ libc/include/ libc/locale/ libc/locale/programs/ libc/manual/ libc/misc/ ...
Previous by thread: [Commits] r23394 - in /fsf/trunk/libc: ./ dlfcn/ elf/ misc/ ports/ ports/sysdeps/aarch64/ ports/sysdeps/alpha/ ports/sysdeps/m68k/ por...
Next by thread: [Commits] r23422 - in /trunk: ./ libc/ libc/dlfcn/ libc/elf/ libc/include/ libc/locale/ libc/locale/programs/ libc/manual/ libc/misc/ ...
Index(es):
- Date
- Thread