[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r11133 - in /fsf/trunk/ports: ./ sysdeps/m68k/ sysdeps/m68k/coldfire/ sysdeps/m68k/m680x0/ sysdeps/unix/sysv/linux/m68k/ sys...

To: commits@xxxxxxxxxx
Subject: [commits] r11133 - in /fsf/trunk/ports: ./ sysdeps/m68k/ sysdeps/m68k/coldfire/ sysdeps/m68k/m680x0/ sysdeps/unix/sysv/linux/m68k/ sys...
From: eglibc@xxxxxxxxxx
Date: Tue, 03 Aug 2010 07:03:43 -0000
Author: eglibc
Date: Tue Aug  3 00:03:41 2010
New Revision: 11133

Log:
Import glibc-ports-mainline for 2010-08-03

Added:
    fsf/trunk/ports/sysdeps/m68k/coldfire/sysdep.h
    fsf/trunk/ports/sysdeps/m68k/m680x0/sysdep.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h
Modified:
    fsf/trunk/ports/ChangeLog.m68k
    fsf/trunk/ports/sysdeps/m68k/sysdep.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h

Modified: fsf/trunk/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/ports/ChangeLog.m68k (original)
+++ fsf/trunk/ports/ChangeLog.m68k Tue Aug  3 00:03:41 2010
@@ -1,3 +1,19 @@
+2010-08-02  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/m68k/coldfire/sysdep.h: New file.
+	(PCREL_OP): Define.
+	* sysdeps/m68k/m680x0/sysdep.h: New file.
+	(PCREL_OP): Define.
+	* sysdeps/m68k/sysdep.h (PCREL_OP): Don't define here.
+	* sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h: New file.
+	(SYSCALL_ERROR_LOAD_GOT): Define.
+	* sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h: New file.
+	(SYSCALL_ERROR_LOAD_GOT): Define.
+	* sysdeps/unix/sysv/linux/m68k/sysdep.h: Don't include subordinate
+	sysdep files.
+	(SYSCALL_ERROR_HANDLER) [PIC && USE___THREAD]: Use
+	SYSCALL_ERROR_LOAD_GOT.
+
 2010-06-24  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h (F_SETPIPE_SZ,

Added: fsf/trunk/ports/sysdeps/m68k/coldfire/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/m68k/coldfire/sysdep.h (added)
+++ fsf/trunk/ports/sysdeps/m68k/coldfire/sysdep.h Tue Aug  3 00:03:41 2010
@@ -1,0 +1,36 @@
+/* Assembler macros for Coldfire.
+   Copyright (C) 1998, 2003, 2010 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdeps/m68k/sysdep.h>
+
+#ifdef __ASSEMBLER__
+
+/* Perform operation OP with PC-relative SRC as the first operand and
+   DST as the second.  TMP is available as a temporary if needed.  */
+# define PCREL_OP(OP, SRC, DST, TMP) \
+  move.l &SRC - ., TMP; OP (-8, %pc, TMP), DST
+
+#else
+
+/* As above, but PC is the spelling of the PC register.  We need this
+   so that the macro can be used in both normal and extended asms.  */
+# define PCREL_OP(OP, SRC, DST, TMP, PC) \
+  "move.l #" SRC " - ., " TMP "\n\t" OP " (-8, " PC ", " TMP "), " DST
+
+#endif	/* __ASSEMBLER__ */

Added: fsf/trunk/ports/sysdeps/m68k/m680x0/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/m68k/m680x0/sysdep.h (added)
+++ fsf/trunk/ports/sysdeps/m68k/m680x0/sysdep.h Tue Aug  3 00:03:41 2010
@@ -1,0 +1,36 @@
+/* Assembler macros for m680x0.
+   Copyright (C) 2010 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdeps/m68k/sysdep.h>
+
+#ifdef __ASSEMBLER__
+
+/* Perform operation OP with PC-relative SRC as the first operand and
+   DST as the second.  TMP is available as a temporary if needed.  */
+#define PCREL_OP(OP, SRC, DST, TMP) \
+  OP SRC(%pc), DST
+
+#else
+
+/* As above, but PC is the spelling of the PC register.  We need this
+   so that the macro can be used in both normal and extended asms.  */
+#define PCREL_OP(OP, SRC, DST, TMP, PC) \
+  OP " " SRC "(" PC "), " DST
+
+#endif	/* __ASSEMBLER__ */

Modified: fsf/trunk/ports/sysdeps/m68k/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/m68k/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/m68k/sysdep.h Tue Aug  3 00:03:41 2010
@@ -1,5 +1,5 @@
 /* Assembler macros for m68k.
-   Copyright (C) 1998, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2003, 2010 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
@@ -97,26 +97,4 @@
 #  define JUMPTARGET(name)	name
 # endif
 
-/* Perform operation OP with PC-relative SRC as the first operand and
-   DST as the second.  TMP is available as a temporary if needed.  */
-#ifdef __mcoldfire__
-#define PCREL_OP(OP, SRC, DST, TMP) \
-  move.l &SRC - ., TMP; OP (-8, %pc, TMP), DST
-#else
-#define PCREL_OP(OP, SRC, DST, TMP) \
-  OP SRC(%pc), DST
-#endif
-
-#else
-
-/* As above, but PC is the spelling of the PC register.  We need this
-   so that the macro can be used in both normal and extended asms.  */
-#ifdef __mcoldfire__
-#define PCREL_OP(OP, SRC, DST, TMP, PC) \
-  "move.l #" SRC " - ., " TMP "\n\t" OP " (-8, " PC ", " TMP "), " DST
-#else
-#define PCREL_OP(OP, SRC, DST, TMP, PC) \
-  OP " " SRC "(" PC "), " DST
-#endif
-
 #endif	/* __ASSEMBLER__ */

Added: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h (added)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h Tue Aug  3 00:03:41 2010
@@ -1,0 +1,30 @@
+/* Copyright (C) 2010 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _LINUX_M68K_COLDFIRE_SYSDEP_H
+#define _LINUX_M68K_COLDFIRE_SYSDEP_H 1
+
+#include <sysdeps/unix/sysdep.h>
+#include <sysdeps/m68k/coldfire/sysdep.h>
+#include <sysdeps/unix/sysv/linux/m68k/sysdep.h>
+
+#define SYSCALL_ERROR_LOAD_GOT(reg)					      \
+    move.l #_GLOBAL_OFFSET_TABLE_@GOTPC, reg;				      \
+    lea (-6, %pc, reg), reg
+
+#endif

Added: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h (added)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h Tue Aug  3 00:03:41 2010
@@ -1,0 +1,29 @@
+/* Copyright (C) 2010 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _LINUX_M68K_M680X0_SYSDEP_H
+#define _LINUX_M68K_M680X0_SYSDEP_H 1
+
+#include <sysdeps/unix/sysdep.h>
+#include <sysdeps/m68k/m680x0/sysdep.h>
+#include <sysdeps/unix/sysv/linux/m68k/sysdep.h>
+
+#define SYSCALL_ERROR_LOAD_GOT(reg)					      \
+    lea (_GLOBAL_OFFSET_TABLE_@GOTPC, %pc), reg
+
+#endif

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h Tue Aug  3 00:03:41 2010
@@ -19,11 +19,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef _LINUX_M68K_SYSDEP_H
-#define _LINUX_M68K_SYSDEP_H 1
-
-#include <sysdeps/unix/sysdep.h>
-#include <sysdeps/m68k/sysdep.h>
 #include <tls.h>
 
 /* Defines RTLD_PRIVATE_ERRNO.  */
@@ -122,7 +117,7 @@
     neg.l %d0;								      \
     move.l %d0, -(%sp);							      \
     jbsr __m68k_read_tp@PLTPC;						      \
-    lea (_GLOBAL_OFFSET_TABLE_@GOTPC, %pc), %a1;			      \
+    SYSCALL_ERROR_LOAD_GOT (%a1);					      \
     add.l (SYSCALL_ERROR_ERRNO@TLSIE, %a1), %a0;			      \
     move.l (%sp)+, (%a0);						      \
     move.l &-1, %d0;							      \
@@ -333,5 +328,3 @@
    even when statically linked.  */
 # define NEED_STATIC_SYSINFO_DSO 1
 #endif
-
-#endif
Prev by Date: [commits] r11132 - in /fsf/trunk/libc: ChangeLog hurd/hurdselect.c
Next by Date: [commits] r11140 - in /fsf/trunk/libc: ChangeLog sysdeps/mach/hurd/ttyname.c sysdeps/mach/hurd/ttyname_r.c
Previous by thread: [commits] r11132 - in /fsf/trunk/libc: ChangeLog hurd/hurdselect.c
Next by thread: [commits] r11140 - in /fsf/trunk/libc: ChangeLog sysdeps/mach/hurd/ttyname.c sysdeps/mach/hurd/ttyname_r.c
Index(es):
- Date
- Thread