r4405 - glibc-package/trunk/debian/patches/m68k
Author: aurel32
Date: 2010-09-01 09:55:05 +0000 (Wed, 01 Sep 2010)
New Revision: 4405
Modified:
glibc-package/trunk/debian/patches/m68k/cvs-tls-support.patch
Log:
Fix patchlevel of cvs-tls-support.patch (should be applied to ports/)
Modified: glibc-package/trunk/debian/patches/m68k/cvs-tls-support.patch
===================================================================
--- glibc-package/trunk/debian/patches/m68k/cvs-tls-support.patch 2010-09-01 09:46:31 UTC (rev 4404)
+++ glibc-package/trunk/debian/patches/m68k/cvs-tls-support.patch 2010-09-01 09:55:05 UTC (rev 4405)
@@ -10,10 +10,10 @@
Change misleading names of parameters of sync_file_range for M68K.
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 7a3e8b7..87117d3 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2009-11-18 Joseph Myers <joseph@codesourcery.com>
+
@@ -23,10 +23,10 @@
2009-11-17 Joseph Myers <joseph@codesourcery.com>
[BZ #10972]
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
index 6fc7a0a..c6dd1a8 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
@@ -236,7 +236,7 @@ extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
@@ -45,10 +45,10 @@
Define F_OWNER_PGRP for M68K.
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 87117d3..74407c4 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2009-11-19 Joseph Myers <joseph@codesourcery.com>
+
@@ -58,10 +58,10 @@
2009-11-18 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Change misleading
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
index c6dd1a8..8ed8eb6 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
@@ -171,9 +171,10 @@ struct flock64
/* Owner types. */
enum __pid_type
@@ -85,10 +85,10 @@
Use struct timespec for timestamps in struct stat also if __USE_XOPEN2K8
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 74407c4..42d6a91 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2009-11-23 Andreas Schwab <schwab@linux-m68k.org>
+
@@ -98,10 +98,10 @@
2009-11-19 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Introduce new symbol
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/sysdeps/unix/sysv/linux/m68k/bits/stat.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
index 8d18d6d..7801043 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/stat.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
@@ -61,7 +61,7 @@ struct stat
#else
__blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
@@ -146,10 +146,10 @@
Update M68K O_SYNC.
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 42d6a91..8411570 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2009-12-16 Joseph Myers <joseph@codesourcery.com>
+
@@ -159,10 +159,10 @@
2009-11-23 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Use struct timespec
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
index 8ed8eb6..1f98cf5 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
@@ -40,7 +40,7 @@
#define O_APPEND 02000
#define O_NONBLOCK 04000
@@ -190,10 +190,10 @@
Update M68K bits/poll.h for POSIX 2008.
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 8411570..978cd1a 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,5 +1,11 @@
2009-12-16 Joseph Myers <joseph@codesourcery.com>
@@ -206,10 +206,10 @@
* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Redefine O_SYNC and
O_DSYNC to match 2.6.33+ kernels.
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/poll.h b/sysdeps/unix/sysv/linux/m68k/bits/poll.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/poll.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/poll.h
index bc28579..84219ba 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/poll.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/poll.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/poll.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/poll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2008, 2009 Free Software Foundation, Inc.
@@ -234,10 +234,10 @@
Update M68K bits/fcntl.h for XPG7 and allow bits/stat.h inclusion from fcntl.h.
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 978cd1a..094e7a8 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,11 @@
+2010-01-10 Joseph Myers <joseph@codesourcery.com>
+
@@ -250,10 +250,10 @@
2009-12-16 Joseph Myers <joseph@codesourcery.com>
[BZ #11093]
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
index 1f98cf5..d1eb706 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
@@ -1,5 +1,5 @@
/* O_*, F_*, FD_* bit values for Linux.
- Copyright (C) 2000, 2004, 2008, 2009 Free Software Foundation, Inc.
@@ -296,10 +296,10 @@
# define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with
close-on-exit set. */
#endif
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/sysdeps/unix/sysv/linux/m68k/bits/stat.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
index 7801043..771a53a 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/stat.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,95,96,97,98,99,2000,2001,2002,2008,2009
+/* Copyright (C) 1992,95,96,97,98,99,2000,2001,2002,2008,2009,2010
@@ -324,10 +324,10 @@
Fix M68K bits/stat.h double inclusion problem.
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 094e7a8..cdc9242 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2010-01-11 Joseph Myers <joseph@codesourcery.com>
+
@@ -337,10 +337,10 @@
2010-01-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Define O_DIRECTORY,
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/sysdeps/unix/sysv/linux/m68k/bits/stat.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
index 771a53a..0c1d149 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/stat.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
@@ -21,6 +21,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif
@@ -366,10 +366,10 @@
Add hidden alias for M68K fegetenv.
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index cdc9242..8487ba3 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,7 @@
+2010-02-10 Joseph Myers <joseph@codesourcery.com>
+
@@ -378,10 +378,10 @@
2010-01-11 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Fix double-inclusion
-diff --git a/sysdeps/m68k/fpu/fegetenv.c b/sysdeps/m68k/fpu/fegetenv.c
+diff --git a/ports/sysdeps/m68k/fpu/fegetenv.c b/ports/sysdeps/m68k/fpu/fegetenv.c
index 6f23e8b..30f3fa5 100644
---- a/sysdeps/m68k/fpu/fegetenv.c
-+++ b/sysdeps/m68k/fpu/fegetenv.c
+--- a/ports/sysdeps/m68k/fpu/fegetenv.c
++++ b/ports/sysdeps/m68k/fpu/fegetenv.c
@@ -1,5 +1,5 @@
/* Store current floating-point environment.
- Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc.
@@ -404,10 +404,10 @@
m68k: update jmpbuf-unwind.h
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 8487ba3..d14368e 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2010-03-09 Maxim Kuvyrkov <maxim@codesourcery.com>
+
@@ -417,10 +417,10 @@
2010-02-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/m68k/fpu/fegetenv.c: Add hidden alias.
-diff --git a/sysdeps/m68k/jmpbuf-unwind.h b/sysdeps/m68k/jmpbuf-unwind.h
+diff --git a/ports/sysdeps/m68k/jmpbuf-unwind.h b/ports/sysdeps/m68k/jmpbuf-unwind.h
index 3490c79..28b9537 100644
---- a/sysdeps/m68k/jmpbuf-unwind.h
-+++ b/sysdeps/m68k/jmpbuf-unwind.h
+--- a/ports/sysdeps/m68k/jmpbuf-unwind.h
++++ b/ports/sysdeps/m68k/jmpbuf-unwind.h
@@ -1,5 +1,5 @@
/* Examine __jmp_buf for unwinding frames. m68k version.
- Copyright (C) 2006 Free Software Foundation, Inc.
@@ -467,10 +467,10 @@
m68k: remove bits/siginfo.h in favor of generic one
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index d14368e..e2b54e5 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,5 +1,7 @@
2010-03-09 Maxim Kuvyrkov <maxim@codesourcery.com>
@@ -479,10 +479,10 @@
* sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ)
(_jmpbuf_sp, _JMPBUF_UNWINDS_ADJ, __libc_unwind_longjmp): Define.
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h b/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h
deleted file mode 100644
index 1ded1c2..0000000
---- a/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/* siginfo_t, sigevent and constants. m68k linux version.
@@ -810,10 +810,10 @@
m68k: update ColdFire sigcontext ABI
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index e2b54e5..d63b88e 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,5 +1,8 @@
2010-03-09 Maxim Kuvyrkov <maxim@codesourcery.com>
@@ -823,10 +823,10 @@
* sysdeps/unix/sysv/linux/m68k/bits/siginfo.h: Remove.
* sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ)
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h b/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h
deleted file mode 100644
index 8ad0c96..0000000
---- a/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright (C) 2006 Free Software Foundation, Inc.
@@ -891,10 +891,10 @@
-};
-
-#endif
-diff --git a/sysdeps/unix/sysv/linux/m68k/register-dump.h b/sysdeps/unix/sysv/linux/m68k/register-dump.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/register-dump.h b/ports/sysdeps/unix/sysv/linux/m68k/register-dump.h
index 391902f..78709d9 100644
---- a/sysdeps/unix/sysv/linux/m68k/register-dump.h
-+++ b/sysdeps/unix/sysv/linux/m68k/register-dump.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/register-dump.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/register-dump.h
@@ -40,7 +40,6 @@
*/
@@ -981,10 +981,10 @@
NPTL support for m68k/ColdFire
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index d63b88e..32681ff 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,5 +1,45 @@
2010-03-09 Maxim Kuvyrkov <maxim@codesourcery.com>
@@ -1031,10 +1031,10 @@
* sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h: Remove.
* sysdeps/unix/sysv/linux/m68k/register-dump.h: Update.
-diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
+diff --git a/ports/sysdeps/m68k/dl-machine.h b/ports/sysdeps/m68k/dl-machine.h
index 08a4396..9bc35e7 100644
---- a/sysdeps/m68k/dl-machine.h
-+++ b/sysdeps/m68k/dl-machine.h
+--- a/ports/sysdeps/m68k/dl-machine.h
++++ b/ports/sysdeps/m68k/dl-machine.h
@@ -1,5 +1,6 @@
/* Machine-dependent ELF dynamic relocation inline functions. m68k version.
- Copyright (C) 1996-2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -1105,11 +1105,11 @@
case R_68K_NONE: /* Alright, Wilbur. */
break;
default:
-diff --git a/sysdeps/m68k/dl-tls.h b/sysdeps/m68k/dl-tls.h
+diff --git a/ports/sysdeps/m68k/dl-tls.h b/ports/sysdeps/m68k/dl-tls.h
new file mode 100644
index 0000000..f2ce998
--- /dev/null
-+++ b/sysdeps/m68k/dl-tls.h
++++ b/ports/sysdeps/m68k/dl-tls.h
@@ -0,0 +1,48 @@
+/* Thread-local storage handling in the ELF dynamic linker. M68K version.
+ Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1159,11 +1159,11 @@
+
+#define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET)
+#define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET)
-diff --git a/sysdeps/m68k/libc-tls.c b/sysdeps/m68k/libc-tls.c
+diff --git a/ports/sysdeps/m68k/libc-tls.c b/ports/sysdeps/m68k/libc-tls.c
new file mode 100644
index 0000000..e865fac
--- /dev/null
-+++ b/sysdeps/m68k/libc-tls.c
++++ b/ports/sysdeps/m68k/libc-tls.c
@@ -0,0 +1,38 @@
+/* Thread-local storage handling in the ELF dynamic linker. m68k version.
+ Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1203,11 +1203,11 @@
+}
+
+#endif
-diff --git a/sysdeps/m68k/nptl/Makefile b/sysdeps/m68k/nptl/Makefile
+diff --git a/ports/sysdeps/m68k/nptl/Makefile b/ports/sysdeps/m68k/nptl/Makefile
new file mode 100644
index 0000000..f36fc8f
--- /dev/null
-+++ b/sysdeps/m68k/nptl/Makefile
++++ b/ports/sysdeps/m68k/nptl/Makefile
@@ -0,0 +1,22 @@
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
@@ -1231,11 +1231,11 @@
+ifeq ($(subdir),csu)
+gen-as-const-headers += tcb-offsets.sym
+endif
-diff --git a/sysdeps/m68k/nptl/pthread_spin_lock.c b/sysdeps/m68k/nptl/pthread_spin_lock.c
+diff --git a/ports/sysdeps/m68k/nptl/pthread_spin_lock.c b/ports/sysdeps/m68k/nptl/pthread_spin_lock.c
new file mode 100644
index 0000000..1cc16c8
--- /dev/null
-+++ b/sysdeps/m68k/nptl/pthread_spin_lock.c
++++ b/ports/sysdeps/m68k/nptl/pthread_spin_lock.c
@@ -0,0 +1,31 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -1268,11 +1268,11 @@
+
+ return 0;
+}
-diff --git a/sysdeps/m68k/nptl/pthread_spin_trylock.c b/sysdeps/m68k/nptl/pthread_spin_trylock.c
+diff --git a/ports/sysdeps/m68k/nptl/pthread_spin_trylock.c b/ports/sysdeps/m68k/nptl/pthread_spin_trylock.c
new file mode 100644
index 0000000..831bffb
--- /dev/null
-+++ b/sysdeps/m68k/nptl/pthread_spin_trylock.c
++++ b/ports/sysdeps/m68k/nptl/pthread_spin_trylock.c
@@ -0,0 +1,28 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -1302,11 +1302,11 @@
+{
+ return atomic_compare_and_exchange_val_acq(lock, 1, 0) ? EBUSY : 0;
+}
-diff --git a/sysdeps/m68k/nptl/pthreaddef.h b/sysdeps/m68k/nptl/pthreaddef.h
+diff --git a/ports/sysdeps/m68k/nptl/pthreaddef.h b/ports/sysdeps/m68k/nptl/pthreaddef.h
new file mode 100644
index 0000000..0a54907
--- /dev/null
-+++ b/sysdeps/m68k/nptl/pthreaddef.h
++++ b/ports/sysdeps/m68k/nptl/pthreaddef.h
@@ -0,0 +1,39 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -1347,11 +1347,11 @@
+/* XXX Until we have a better place keep the definitions here. */
+#define __exit_thread_inline(val) \
+ INLINE_SYSCALL (exit, 1, (val))
-diff --git a/sysdeps/m68k/nptl/tcb-offsets.sym b/sysdeps/m68k/nptl/tcb-offsets.sym
+diff --git a/ports/sysdeps/m68k/nptl/tcb-offsets.sym b/ports/sysdeps/m68k/nptl/tcb-offsets.sym
new file mode 100644
index 0000000..b1bba65
--- /dev/null
-+++ b/sysdeps/m68k/nptl/tcb-offsets.sym
++++ b/ports/sysdeps/m68k/nptl/tcb-offsets.sym
@@ -0,0 +1,11 @@
+#include <sysdep.h>
+#include <tls.h>
@@ -1364,11 +1364,11 @@
+MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads)
+PID_OFFSET thread_offsetof (pid)
+TID_OFFSET thread_offsetof (tid)
-diff --git a/sysdeps/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h
+diff --git a/ports/sysdeps/m68k/nptl/tls.h b/ports/sysdeps/m68k/nptl/tls.h
new file mode 100644
index 0000000..c29824c
--- /dev/null
-+++ b/sysdeps/m68k/nptl/tls.h
++++ b/ports/sysdeps/m68k/nptl/tls.h
@@ -0,0 +1,171 @@
+/* Definition for thread-local data handling. NPTL/m68k version.
+ Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1541,11 +1541,11 @@
+#endif /* __ASSEMBLER__ */
+
+#endif /* tls.h */
-diff --git a/sysdeps/m68k/tls-macros.h b/sysdeps/m68k/tls-macros.h
+diff --git a/ports/sysdeps/m68k/tls-macros.h b/ports/sysdeps/m68k/tls-macros.h
new file mode 100644
index 0000000..d03d7b9
--- /dev/null
-+++ b/sysdeps/m68k/tls-macros.h
++++ b/ports/sysdeps/m68k/tls-macros.h
@@ -0,0 +1,70 @@
+/* Macros for accessing thread-local storage. m68k version.
+ Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1617,10 +1617,10 @@
+ : "=a" (__offset)); \
+ (int *) (__tp + __offset); })
+
-diff --git a/sysdeps/unix/sysv/linux/m68k/Makefile b/sysdeps/unix/sysv/linux/m68k/Makefile
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/Makefile b/ports/sysdeps/unix/sysv/linux/m68k/Makefile
index 6bb4f6b..97d9584 100644
---- a/sysdeps/unix/sysv/linux/m68k/Makefile
-+++ b/sysdeps/unix/sysv/linux/m68k/Makefile
+--- a/ports/sysdeps/unix/sysv/linux/m68k/Makefile
++++ b/ports/sysdeps/unix/sysv/linux/m68k/Makefile
@@ -2,12 +2,18 @@
m68k-syntax-flag = -DMOTOROLA_SYNTAX
@@ -1640,10 +1640,10 @@
sysdep-others += lddlibc4
install-bin += lddlibc4
endif
-diff --git a/sysdeps/unix/sysv/linux/m68k/Versions b/sysdeps/unix/sysv/linux/m68k/Versions
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/Versions b/ports/sysdeps/unix/sysv/linux/m68k/Versions
index 5650f7f..8a941f8 100644
---- a/sysdeps/unix/sysv/linux/m68k/Versions
-+++ b/sysdeps/unix/sysv/linux/m68k/Versions
+--- a/ports/sysdeps/unix/sysv/linux/m68k/Versions
++++ b/ports/sysdeps/unix/sysv/linux/m68k/Versions
@@ -32,4 +32,18 @@ libc {
GLIBC_2.11 {
fallocate64;
@@ -1663,11 +1663,11 @@
+ __rtld___vdso_atomic_barrier;
+ }
}
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
new file mode 100644
index 0000000..c361060
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
@@ -0,0 +1,61 @@
+/* Resolve function pointers to VDSO functions.
+ Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1730,10 +1730,10 @@
+#endif /* SHARED */
+
+#endif /* _M68K_VDSO_H */
-diff --git a/sysdeps/unix/sysv/linux/m68k/clone.S b/sysdeps/unix/sysv/linux/m68k/clone.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/clone.S b/ports/sysdeps/unix/sysv/linux/m68k/clone.S
index a179f8e..401e2ef 100644
---- a/sysdeps/unix/sysv/linux/m68k/clone.S
-+++ b/sysdeps/unix/sysv/linux/m68k/clone.S
+--- a/ports/sysdeps/unix/sysv/linux/m68k/clone.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/clone.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,97,98,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996,97,98,2002,2010 Free Software Foundation, Inc.
@@ -1829,11 +1829,11 @@
PSEUDO_END (__clone)
-diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h b/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h b/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h
new file mode 100644
index 0000000..1198bb9
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h
@@ -0,0 +1,105 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -1940,11 +1940,11 @@
+#endif
+
+#endif
-diff --git a/sysdeps/unix/sysv/linux/m68k/init-first.c b/sysdeps/unix/sysv/linux/m68k/init-first.c
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/init-first.c b/ports/sysdeps/unix/sysv/linux/m68k/init-first.c
new file mode 100644
index 0000000..f8168d1
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/init-first.c
++++ b/ports/sysdeps/unix/sysv/linux/m68k/init-first.c
@@ -0,0 +1,74 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2020,18 +2020,18 @@
+#endif /* SHARED */
+
+#include <sysdeps/unix/sysv/linux/init-first.c>
-diff --git a/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c b/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c b/ports/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c
new file mode 100644
index 0000000..45982e9
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c
++++ b/ports/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c
@@ -0,0 +1 @@
+#include "m68k-vdso.c"
-diff --git a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
new file mode 100644
index 0000000..00db4bb
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
@@ -0,0 +1,105 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2138,11 +2138,11 @@
+/* If the vDSO is not available, use a syscall to get TP. */
+ strong_alias (__vdso_read_tp_stub, __m68k_read_tp)
+# endif /* SHARED */
-diff --git a/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c b/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c b/ports/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
new file mode 100644
index 0000000..73b2570
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
++++ b/ports/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
@@ -0,0 +1,35 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2179,11 +2179,11 @@
+= (void *) __vdso_atomic_barrier_stub;
+
+#endif /* SHARED */
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
new file mode 100644
index 0000000..0140810
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
@@ -0,0 +1,172 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2357,11 +2357,11 @@
+
+
+#endif /* bits/pthreadtypes.h */
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h b/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
new file mode 100644
index 0000000..2950cc9
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
@@ -0,0 +1,36 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2399,19 +2399,19 @@
+ char __size[__SIZEOF_SEM_T];
+ long int __align;
+} sem_t;
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/clone.S b/sysdeps/unix/sysv/linux/m68k/nptl/clone.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/clone.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/clone.S
new file mode 100644
index 0000000..e7388fe
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/clone.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/clone.S
@@ -0,0 +1,2 @@
+#define RESET_PID
+#include "../clone.S"
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c b/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c b/ports/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c
new file mode 100644
index 0000000..be11444
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c
@@ -0,0 +1,25 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2438,11 +2438,11 @@
+
+/* Get the real implementation. */
+#include <nptl/sysdeps/pthread/createthread.c>
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/fork.c b/sysdeps/unix/sysv/linux/m68k/nptl/fork.c
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/fork.c b/ports/sysdeps/unix/sysv/linux/m68k/nptl/fork.c
new file mode 100644
index 0000000..dc1584e
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/fork.c
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/fork.c
@@ -0,0 +1,30 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2474,11 +2474,11 @@
+ NULL, &THREAD_SELF->tid, NULL)
+
+#include <sysdeps/unix/sysv/linux/fork.c>
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
new file mode 100644
index 0000000..926077d
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
@@ -0,0 +1,281 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2761,11 +2761,11 @@
+ })
+
+#endif /* lowlevellock.h */
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S b/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
new file mode 100644
index 0000000..36c9270
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
@@ -0,0 +1,36 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2803,11 +2803,11 @@
+1:
+
+#include <sysdeps/unix/sysv/linux/m68k/vfork.S>
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c b/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c
new file mode 100644
index 0000000..415045f
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c
@@ -0,0 +1,91 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -2900,11 +2900,11 @@
+}
+weak_alias (__pthread_once, pthread_once)
+strong_alias (__pthread_once, __pthread_once_internal)
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
new file mode 100644
index 0000000..87e2d55
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
@@ -0,0 +1,141 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -3047,11 +3047,11 @@
+ header.multiple_threads) == 0, \
+ 1)
+#endif
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S b/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
new file mode 100644
index 0000000..8599c3d
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
@@ -0,0 +1,38 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -3091,10 +3091,10 @@
+1:
+
+#include <sysdeps/unix/sysv/linux/m68k/vfork.S>
-diff --git a/sysdeps/unix/sysv/linux/m68k/socket.S b/sysdeps/unix/sysv/linux/m68k/socket.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/socket.S b/ports/sysdeps/unix/sysv/linux/m68k/socket.S
index 2690f18..147a3b2 100644
---- a/sysdeps/unix/sysv/linux/m68k/socket.S
-+++ b/sysdeps/unix/sysv/linux/m68k/socket.S
+--- a/ports/sysdeps/unix/sysv/linux/m68k/socket.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/socket.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2010 Free Software Foundation, Inc.
@@ -3166,10 +3166,10 @@
/* Successful; return the syscall's value. */
rts
-diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h b/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
index 12687d8..e3aed15 100644
---- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1996, 1997, 1998, 2000, 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2010
@@ -3240,10 +3240,10 @@
+#endif
+
#endif
-diff --git a/sysdeps/unix/sysv/linux/m68k/vfork.S b/sysdeps/unix/sysv/linux/m68k/vfork.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
index 8027b2f..61bbf2f 100644
---- a/sysdeps/unix/sysv/linux/m68k/vfork.S
-+++ b/sysdeps/unix/sysv/linux/m68k/vfork.S
+--- a/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2002, 2003, 2010 Free Software Foundation, Inc.
@@ -3295,10 +3295,10 @@
Whitespace cleanup
---
-diff --git a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
index 00db4bb..242d23d 100644
---- a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-+++ b/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
+--- a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
@@ -86,7 +86,7 @@ ENTRY (__vdso_atomic_cmpxchg_32_stub)
rts
cfi_endproc
@@ -3308,10 +3308,10 @@
.hidden __vdso_atomic_barrier_stub
ENTRY (__vdso_atomic_barrier_stub)
cfi_startproc
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
index 926077d..bc2970e 100644
---- a/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
@@ -73,7 +73,7 @@
: (fl)) \
: ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG) \
@@ -3321,10 +3321,10 @@
#endif
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S b/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
index 36c9270..639d5ed 100644
---- a/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
+--- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
@@ -31,6 +31,6 @@
tstl %d0 ; \
beq 1f ; /* If we are the parent... */ \
@@ -3333,10 +3333,10 @@
+1:
#include <sysdeps/unix/sysv/linux/m68k/vfork.S>
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S b/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
index 8599c3d..95e3764 100644
---- a/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
+--- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
@@ -33,6 +33,6 @@
tstl %d0 ; \
beq 1f ; /* If we are the parent... */ \
@@ -3345,10 +3345,10 @@
+1:
#include <sysdeps/unix/sysv/linux/m68k/vfork.S>
-diff --git a/sysdeps/unix/sysv/linux/m68k/vfork.S b/sysdeps/unix/sysv/linux/m68k/vfork.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
index 61bbf2f..4def7e3 100644
---- a/sysdeps/unix/sysv/linux/m68k/vfork.S
-+++ b/sysdeps/unix/sysv/linux/m68k/vfork.S
+--- a/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
@@ -43,7 +43,7 @@ ENTRY (__vfork)
saves data in D1 and A1. */
@@ -3367,10 +3367,10 @@
Add m68k-helpers optimized for m680x0
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 32681ff..446a307 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,10 @@
+2010-03-12 Andreas Schwab <schwab@linux-m68k.org>
+
@@ -3382,17 +3382,17 @@
2010-03-09 Maxim Kuvyrkov <maxim@codesourcery.com>
NPTL support for m68k/ColdFire
-diff --git a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/sysdeps/unix/sysv/linux/m68k/coldfire/m68k-helpers.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/ports/sysdeps/unix/sysv/linux/m68k/coldfire/m68k-helpers.S
similarity index 100%
copy from sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
copy to sysdeps/unix/sysv/linux/m68k/coldfire/m68k-helpers.S
-diff --git a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/ports/sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S
similarity index 97%
rename from sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
rename to sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S
index 242d23d..83ce564 100644
---- a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S
+--- a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
++++ b/ports/sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S
@@ -60,11 +60,9 @@ END (__vdso_read_tp_stub)
# endif
ENTRY (__m68k_read_tp)
@@ -3416,10 +3416,10 @@
m68k: don't include <sysdep.h> in lowlevellock.h
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 446a307..712651d 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,5 +1,8 @@
2010-03-12 Andreas Schwab <schwab@linux-m68k.org>
@@ -3429,10 +3429,10 @@
* sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Renamed ...
* sysdeps/unix/sysv/linux/m68k/coldfire/m68k-helpers.S: ... to
this.
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
index bc2970e..5ca78ec 100644
---- a/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
@@ -26,7 +26,6 @@
#include <sys/param.h>
#include <bits/pthreadtypes.h>
@@ -3450,10 +3450,10 @@
m68k: TLS reference to errno in syscall stubs
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 712651d..b16fde2 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2010-03-13 Andreas Schwab <schwab@linux-m68k.org>
+
@@ -3463,10 +3463,10 @@
2010-03-12 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h: Don't include
-diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h b/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
index e3aed15..8bd188b 100644
---- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -111,10 +111,27 @@ SYSCALL_ERROR_LABEL: \
a pointer (e.g., mmap). */ \
move.l %d0, %a0; \
@@ -3530,10 +3530,10 @@
m68k: define __signbit inlines
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index b16fde2..1c8d232 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,5 +1,8 @@
2010-03-13 Andreas Schwab <schwab@linux-m68k.org>
@@ -3543,10 +3543,10 @@
* sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER):
Add variant for USE__THREAD.
-diff --git a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
+diff --git a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
index 6b69f7a..0da98e4 100644
---- a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-+++ b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
+--- a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
++++ b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
@@ -1,5 +1,5 @@
/* Definitions of inline math functions implemented by the m68881/2.
- Copyright (C) 1991,92,93,94,96,97,98,99,2000,2002, 2003, 2004, 2008
@@ -3590,10 +3590,10 @@
m68k: remove duplicate __signbit definitions
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 1c8d232..9fafc08 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,7 +1,7 @@
2010-03-13 Andreas Schwab <schwab@linux-m68k.org>
@@ -3603,10 +3603,10 @@
* sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER):
Add variant for USE__THREAD.
-diff --git a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
+diff --git a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
index 0da98e4..975ffd8 100644
---- a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-+++ b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
+--- a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
++++ b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
@@ -301,17 +301,7 @@ __inline_functions(long double,l)
#ifdef __USE_ISOC99
@@ -3635,10 +3635,10 @@
m68k: use signbit macro
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 9fafc08..c7d068e 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,5 +1,8 @@
2010-03-13 Andreas Schwab <schwab@linux-m68k.org>
@@ -3648,10 +3648,10 @@
* sysdeps/m68k/m680x0/fpu/bits/mathinline.h (__signbit)
(__signbitf, __signbitl): Always define as inline.
-diff --git a/sysdeps/m68k/m680x0/fpu/s_ccos.c b/sysdeps/m68k/m680x0/fpu/s_ccos.c
+diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_ccos.c b/ports/sysdeps/m68k/m680x0/fpu/s_ccos.c
index d302d3d..8239159 100644
---- a/sysdeps/m68k/m680x0/fpu/s_ccos.c
-+++ b/sysdeps/m68k/m680x0/fpu/s_ccos.c
+--- a/ports/sysdeps/m68k/m680x0/fpu/s_ccos.c
++++ b/ports/sysdeps/m68k/m680x0/fpu/s_ccos.c
@@ -1,5 +1,5 @@
/* Complex cosine function. m68k fpu version
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
@@ -3668,10 +3668,10 @@
? __real__ x : -__real__ x);
else
__imag__ retval = -sin_rx * m81(__ieee754_sinh) (__imag__ x);
-diff --git a/sysdeps/m68k/m680x0/fpu/s_ccosh.c b/sysdeps/m68k/m680x0/fpu/s_ccosh.c
+diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c b/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
index 1698881..d272e98 100644
---- a/sysdeps/m68k/m680x0/fpu/s_ccosh.c
-+++ b/sysdeps/m68k/m680x0/fpu/s_ccosh.c
+--- a/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
++++ b/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
@@ -1,5 +1,5 @@
/* Complex cosine hyperbole function. m68k fpu version
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
@@ -3696,24 +3696,24 @@
m68k: add c++-types and localplt data for m68k-linux-gnu
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index c7d068e..cdc0ab5 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2010-05-22 Andreas Schwab <schwab@linux-m68k.org>
+
-+ * data/c++-types-m68k-linux-gnu.data: New file.
-+ * data/localplt-m68k-linux-gnu.data: New file.
++ * data/ports/c++-types-m68k-linux-gnu.data: New file.
++ * data/ports/localplt-m68k-linux-gnu.data: New file.
+
2010-03-13 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/m68k/m680x0/fpu/s_ccosh.c: Use signbit macro.
-diff --git a/data/c++-types-m68k-linux-gnu.data b/data/c++-types-m68k-linux-gnu.data
+diff --git a/ports/data/ports/c++-types-m68k-linux-gnu.data b/ports/data/ports/c++-types-m68k-linux-gnu.data
new file mode 100644
index 0000000..fde53bf
--- /dev/null
-+++ b/data/c++-types-m68k-linux-gnu.data
++++ b/ports/data/ports/c++-types-m68k-linux-gnu.data
@@ -0,0 +1,67 @@
+blkcnt64_t:x
+blkcnt_t:l
@@ -3782,11 +3782,11 @@
+useconds_t:j
+ushort:t
+u_short:t
-diff --git a/data/localplt-m68k-linux-gnu.data b/data/localplt-m68k-linux-gnu.data
+diff --git a/ports/data/ports/localplt-m68k-linux-gnu.data b/ports/data/ports/localplt-m68k-linux-gnu.data
new file mode 100644
index 0000000..d266b8f
--- /dev/null
-+++ b/data/localplt-m68k-linux-gnu.data
++++ b/ports/data/ports/localplt-m68k-linux-gnu.data
@@ -0,0 +1,8 @@
+libc.so: _Unwind_Find_FDE
+libc.so: __m68k_read_tp
@@ -3804,10 +3804,10 @@
m68k: force alignment of futex variables
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index cdc0ab5..6cf5d39 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2010-06-11 Andreas Schwab <schwab@linux-m68k.org>
+
@@ -3816,11 +3816,11 @@
+
2010-05-22 Andreas Schwab <schwab@linux-m68k.org>
- * data/c++-types-m68k-linux-gnu.data: New file.
-diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
+ * data/ports/c++-types-m68k-linux-gnu.data: New file.
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
index 0140810..832609d 100644
---- a/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
-+++ b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
@@ -57,7 +57,7 @@ typedef union
{
struct __pthread_mutex_s
@@ -3874,10 +3874,10 @@
m68k: Add required definitions to sys/user.h
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 6cf5d39..bbc8a8c 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2010-06-13 Andreas Schwab <schwab@linux-m68k.org>
+
@@ -3887,10 +3887,10 @@
2010-06-11 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: Force
-diff --git a/sysdeps/unix/sysv/linux/m68k/sys/user.h b/sysdeps/unix/sysv/linux/m68k/sys/user.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h b/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
index f8b19fc..2663ac6 100644
---- a/sysdeps/unix/sysv/linux/m68k/sys/user.h
-+++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
@@ -3915,10 +3915,10 @@
m68k: mark all inline math functions as non-throwing
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index bbc8a8c..c5b5706 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,5 +1,8 @@
2010-06-13 Andreas Schwab <schwab@linux-m68k.org>
@@ -3928,10 +3928,10 @@
* sysdeps/unix/sysv/linux/m68k/sys/user.h (NBPG, UPAGES)
(HOST_TEXT_START_ADDR, HOST_STACK_END_ADDR): Define.
-diff --git a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
+diff --git a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
index 975ffd8..8a17127 100644
---- a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-+++ b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
+--- a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
++++ b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
@@ -126,7 +126,7 @@ __NTH (__signbitl (long double __x))
/* Define a const math function. */
#define __m81_defun(rettype, func, args) \
@@ -3987,10 +3987,10 @@
Define F_SETPIPE_SZ and F_GETPIPE_SZ for M68K.
---
-diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index c5b5706..be4956b 100644
---- a/ChangeLog.m68k
-+++ b/ChangeLog.m68k
+--- a/ports/ChangeLog.m68k
++++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2010-06-24 Joseph Myers <joseph@codesourcery.com>
+
@@ -4000,10 +4000,10 @@
2010-06-13 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/m68k/m680x0/fpu/bits/mathinline.h: Mark all functions as
-diff --git a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
index d1eb706..f36507b 100644
---- a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+--- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
@@ -101,6 +101,8 @@
# define F_SETLEASE 1024 /* Set a lease. */
# define F_GETLEASE 1025 /* Enquire what lease is active. */
Reply to: