[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r11928 - in /fsf/glibc-2_12-branch/ports: ./ sysdeps/m68k/ sysdeps/m68k/coldfire/ sysdeps/m68k/m680x0/ sysdeps/m68k/m680x0/f...
- To: commits@xxxxxxxxxx
- Subject: [commits] r11928 - in /fsf/glibc-2_12-branch/ports: ./ sysdeps/m68k/ sysdeps/m68k/coldfire/ sysdeps/m68k/m680x0/ sysdeps/m68k/m680x0/f...
- From: eglibc@xxxxxxxxxx
- Date: Mon, 01 Nov 2010 07:06:01 -0000
Author: eglibc
Date: Mon Nov 1 00:05:59 2010
New Revision: 11928
Log:
Import glibc-ports-2.12 for 2010-11-01
Added:
fsf/glibc-2_12-branch/ports/sysdeps/m68k/coldfire/sysdep.h
fsf/glibc-2_12-branch/ports/sysdeps/m68k/m680x0/sysdep.h
fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h
fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h
Modified:
fsf/glibc-2_12-branch/ports/ChangeLog.m68k
fsf/glibc-2_12-branch/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
fsf/glibc-2_12-branch/ports/sysdeps/m68k/sysdep.h
fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
Modified: fsf/glibc-2_12-branch/ports/ChangeLog.m68k
==============================================================================
--- fsf/glibc-2_12-branch/ports/ChangeLog.m68k (original)
+++ fsf/glibc-2_12-branch/ports/ChangeLog.m68k Mon Nov 1 00:05:59 2010
@@ -1,3 +1,37 @@
+2010-08-25 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h
+ (SYSCALL_ERROR_LOAD_GOT): Use & instead of #.
+
+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-13 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * sysdeps/m68k/m680x0/fpu/bits/mathinline.h: Mark all functions as
+ non-throwing.
+
+ * sysdeps/unix/sysv/linux/m68k/sys/user.h (NBPG, UPAGES)
+ (HOST_TEXT_START_ADDR, HOST_STACK_END_ADDR): Define.
+
+2010-06-11 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: Force
+ alignment of futex variables.
+
2010-03-13 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
* sysdeps/m68k/m680x0/fpu/s_ccosh.c: Use signbit macro.
Added: fsf/glibc-2_12-branch/ports/sysdeps/m68k/coldfire/sysdep.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/m68k/coldfire/sysdep.h (added)
+++ fsf/glibc-2_12-branch/ports/sysdeps/m68k/coldfire/sysdep.h Mon Nov 1 00:05:59 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__ */
Modified: fsf/glibc-2_12-branch/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h Mon Nov 1 00:05:59 2010
@@ -126,7 +126,7 @@
/* Define a const math function. */
#define __m81_defun(rettype, func, args) \
__m81_inline rettype __attribute__((__const__)) \
- __m81_u(func) args
+ __NTH (__m81_u(func) args)
/* Define the three variants of a math function that has a direct
implementation in the m68k fpu. FUNC is the name for C (which will be
@@ -329,8 +329,8 @@
} \
\
__m81_inline float_type \
-__m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y, \
- float_type __z) \
+__NTH (__m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y, \
+ float_type __z)) \
{ \
return (__x * __y) + __z; \
}
@@ -346,8 +346,8 @@
# define __inline_functions(float_type, s) \
__m81_inline void \
-__m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx, \
- float_type *__cosx) \
+__NTH (__m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx, \
+ float_type *__cosx)) \
{ \
__asm ("fsincos%.x %2,%1:%0" \
: "=f" (*__sinx), "=f" (*__cosx) : "f" (__x)); \
@@ -368,13 +368,13 @@
NAME, to make token pasting work correctly with -traditional. */
# define __inline_forward_c(rettype, name, args1, args2) \
__MATH_INLINE rettype __attribute__((__const__)) \
- name args1 \
+__NTH (name args1) \
{ \
return __CONCAT(__,name) args2; \
}
# define __inline_forward(rettype, name, args1, args2) \
-__MATH_INLINE rettype name args1 \
+__MATH_INLINE rettype __NTH (name args1) \
{ \
return __CONCAT(__,name) args2; \
}
Added: fsf/glibc-2_12-branch/ports/sysdeps/m68k/m680x0/sysdep.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/m68k/m680x0/sysdep.h (added)
+++ fsf/glibc-2_12-branch/ports/sysdeps/m68k/m680x0/sysdep.h Mon Nov 1 00:05:59 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/glibc-2_12-branch/ports/sysdeps/m68k/sysdep.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/m68k/sysdep.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/m68k/sysdep.h Mon Nov 1 00:05:59 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/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h (added)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h Mon Nov 1 00:05:59 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/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h (added)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h Mon Nov 1 00:05:59 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/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h Mon Nov 1 00:05:59 2010
@@ -57,7 +57,7 @@
{
struct __pthread_mutex_s
{
- int __lock;
+ int __lock __attribute__ ((__aligned__ (4)));
unsigned int __count;
int __owner;
/* KIND must stay at this position in the structure to maintain
@@ -87,7 +87,7 @@
{
struct
{
- int __lock;
+ int __lock __attribute__ ((__aligned__ (4)));
unsigned int __futex;
__extension__ unsigned long long int __total_seq;
__extension__ unsigned long long int __wakeup_seq;
@@ -112,7 +112,7 @@
/* Once-only execution */
-typedef int pthread_once_t;
+typedef int __attribute__ ((__aligned__ (4))) pthread_once_t;
#if defined __USE_UNIX98 || defined __USE_XOPEN2K
@@ -122,7 +122,7 @@
{
struct
{
- int __lock;
+ int __lock __attribute__ ((__aligned__ (4)));
unsigned int __nr_readers;
unsigned int __readers_wakeup;
unsigned int __writer_wakeup;
@@ -158,7 +158,7 @@
typedef union
{
char __size[__SIZEOF_PTHREAD_BARRIER_T];
- long int __align;
+ long int __align __attribute__ ((__aligned__ (4)));
} pthread_barrier_t;
typedef union
Modified: fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h Mon Nov 1 00:05:59 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2008, 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
@@ -58,4 +58,9 @@
char u_comm[32];
};
+#define NBPG 4096
+#define UPAGES 1
+#define HOST_TEXT_START_ADDR u.start_code
+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
+
#endif
Modified: fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h Mon Nov 1 00:05:59 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