Update.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* sysdeps/unix/sysv/linux/s390/Dist: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/Dist: ...here.
	* sysdeps/unix/sysv/linux/s390/Makefile: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/Makefile: ...here.
	* sysdeps/unix/sysv/linux/s390/Versions: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/Versions: ...here.
	* sysdeps/unix/sysv/linux/s390/alphasort64.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/alphasort64.c: ...here.
	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/bits/fcntl.h: ...here.
	* sysdeps/unix/sysv/linux/s390/bits/mman.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/bits/mman.h: ...here.
	* sysdeps/unix/sysv/linux/s390/bits/resource.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/bits/resource.h: ...here.
	* sysdeps/unix/sysv/linux/s390/bits/stat.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/bits/stat.h: ...here.
	* sysdeps/unix/sysv/linux/s390/chown.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/chown.c: ...here.
	* sysdeps/unix/sysv/linux/s390/clone.S: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/clone.S: ...here.
	* sysdeps/unix/sysv/linux/s390/fchown.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/fchown.c: ...here.
	* sysdeps/unix/sysv/linux/s390/fcntl.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/fcntl.c: ...here.
	* sysdeps/unix/sysv/linux/s390/fxstat.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/fxstat.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getdents64.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getdents64.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getegid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getegid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/geteuid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/geteuid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getgid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getgid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getgroups.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getgroups.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getresgid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getresgid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getresuid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getresuid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getrlimit.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getrlimit.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getrlimit64.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getrlimit64.c: ...here.
	* sysdeps/unix/sysv/linux/s390/getuid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/getuid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/lchown.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/lchown.c: ...here.
	* sysdeps/unix/sysv/linux/s390/lockf64.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/lockf64.c: ...here.
	* sysdeps/unix/sysv/linux/s390/lxstat.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/lxstat.c: ...here.
	* sysdeps/unix/sysv/linux/s390/mmap.S: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/mmap.S: ...here.
	* sysdeps/unix/sysv/linux/s390/mmap64.S: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S: ...here.
	* sysdeps/unix/sysv/linux/s390/msgctl.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/msgctl.c: ...here.
	* sysdeps/unix/sysv/linux/s390/oldgetrlimit64.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/oldgetrlimit64.c: ...here.
	* sysdeps/unix/sysv/linux/s390/readdir64.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/readdir64.c: ...here.
	* sysdeps/unix/sysv/linux/s390/readdir64_r.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/readdir64_r.c: ...here.
	* sysdeps/unix/sysv/linux/s390/register-dump.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h: ...here.
	* sysdeps/unix/sysv/linux/s390/scandir64.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/scandir64.c: ...here.
	* sysdeps/unix/sysv/linux/s390/semctl.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/semctl.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setegid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setegid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/seteuid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/seteuid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setfsgid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setfsgid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setfsuid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setfsuid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setgid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setgid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setgroups.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setgroups.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setregid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setregid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setresgid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setresgid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setresuid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setresuid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setreuid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setreuid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setrlimit.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setrlimit.c: ...here.
	* sysdeps/unix/sysv/linux/s390/setuid.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/setuid.c: ...here.
	* sysdeps/unix/sysv/linux/s390/shmctl.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/shmctl.c: ...here.
	* sysdeps/unix/sysv/linux/s390/socket.S: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/socket.S: ...here.
	* sysdeps/unix/sysv/linux/s390/sys/procfs.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/sys/procfs.h: ...here.
	* sysdeps/unix/sysv/linux/s390/sys/ucontext.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h: ...here.
	* sysdeps/unix/sysv/linux/s390/syscall.S: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/syscall.S: ...here.
	* sysdeps/unix/sysv/linux/s390/syscalls.list: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list: ...here.
	* sysdeps/unix/sysv/linux/s390/sysdep.S: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: ...here.
	* sysdeps/unix/sysv/linux/s390/sysdep.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: ...here.
	* sysdeps/unix/sysv/linux/s390/versionsort64.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/versionsort64.c: ...here.
	* sysdeps/unix/sysv/linux/s390/xstat.c: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/xstat.c: ...here.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* sysdeps/unix/sysv/linux/s390/s390-64/Dist: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/Makefile: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/elfclass.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/fcntl.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/ipc.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/mman.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/msq.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/resource.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/sem.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/shm.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/sigaction.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/siginfo.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/sigstack.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/stat.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/bits/types.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/clone.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/fstatfs64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/ftruncate64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/fxstat64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/getdents.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/getdents64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/getrlimit64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/glob.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/glob64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/lxstat64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/mmap.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/mmap64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/pread64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/pwrite64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/readdir.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/readdir64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/readdir64_r.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/readdir_r.c : New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/setrlimit64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/sigpending.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/sigprocmask.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/socket.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/statfs64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/sys/procfs.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/sys/ucontext.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/syscall.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/truncate64.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/xstat.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/xstat64.c: New file.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* sysdeps/s390/Dist: Move to...
	* sysdeps/s390/390-32/Dist: ...here.
	* sysdeps/s390/Implies: Move to...
	* sysdeps/s390/s390-32/Implies: ...here.
	* sysdeps/s390/Makefile: Move to...
	* sysdeps/s390/s390-32/Makefile: ...here.
	* sysdeps/s390/Versions: Move to...
	* sysdeps/s390-32/s390/Versions: ...here.
	* sysdeps/s390/add_n.S: Move to...
	* sysdeps/s390/s390-32/add_n.S: ...here.
	* sysdeps/s390/addmul_1.S: Move to...
	* sysdeps/s390/s390-32/addmul_1.S: ...here.
	* sysdeps/s390/atomicity.h: Move to...
	* sysdeps/s390/s390-32/atomicity.h: ...here.
	* sysdeps/s390/backtrace.c: Move to...
	* sysdeps/s390/s390-32/backtrace.c: ...here.
	* sysdeps/s390/bcopy.S: Move to...
	* sysdeps/s390/s390-32/bcopy.S: ...here.
	* sysdeps/s390/bits/byteswap.h: Move to...
	* sysdeps/s390/s390-32/bits/byteswap.h: ...here.
	* sysdeps/s390/bits/huge_val.h: Move to...
	* sysdeps/s390/s390-32/bits/huge_val.h: ...here.
	* sysdeps/s390/bsd-_setjmp.S: Move to...
	* sysdeps/s390/s390-32/bsd-_setjmp.S: ...here.
	* sysdeps/s390/bsd-setjmp.S: Move to...
	* sysdeps/s390/s390-32/bsd-setjmp.S: ...here.
	* sysdeps/s390/bzero.S: Move to...
	* sysdeps/s390/s390-32/bzero.S: ...here.
	* sysdeps/s390/elf/bsd-_setjmp.S: Move to...
	* sysdeps/s390/s390-32/elf/bsd-_setjmp.S: ...here.
	* sysdeps/s390/elf/bsd-setjmp.S: Move to...
	* sysdeps/s390/s390-32/elf/bsd-setjmp.S: ...here.
	* sysdeps/s390/elf/start.S: Move to...
	* sysdeps/s390/s390-32/elf/start.S: ...here.
	* sysdeps/s390/ffs.c: Move to...
	* sysdeps/s390/s390-32/ffs.c: ...here.
	* sysdeps/s390/memchr.S: Move to...
	* sysdeps/s390/s390-32/memchr.S: ...here.
	* sysdeps/s390/memcpy.S: Move to...
	* sysdeps/s390/s390-32/memcpy.S: ...here.
	* sysdeps/s390/memset.S: Move to...
	* sysdeps/s390/s390-32/memset.S: ...here.
	* sysdeps/s390/mul_1.S: Move to...
	* sysdeps/s390/s390-32/mul_1.S: ...here.
	* sysdeps/s390/s390-mcount.S: Move to...
	* sysdeps/s390/s390-32/s390-mcount.S: ...here.
	* sysdeps/s390/strcpy.S: Move to...
	* sysdeps/s390/s390-32/strcpy.S: ...here.
	* sysdeps/s390/strncpy.S: Move to...
	* sysdeps/s390/s390-32/strncpy.S: ...here.
	* sysdeps/s390/sub_n.S: Move to...
	* sysdeps/s390/s390-32/sub_n.S: ...here.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* sysdeps/s390/s390-64/Dist: New file.
	* sysdeps/s390/s390-64/Implies: New file.
	* sysdeps/s390/s390-64/Makefile: New file.
	* sysdeps/s390/s390-64/__longjmp.c: New file.
	* sysdeps/s390/s390-64/add_n.S: New file.
	* sysdeps/s390/s390-64/atomicity.h: New file.
	* sysdeps/s390/s390-64/backtrace.c: New file.
	* sysdeps/s390/s390-64/bcopy.S: New file.
	* sysdeps/s390/s390-64/bits/byteswap.h: New file.
	* sysdeps/s390/s390-64/bits/huge_val.h: New file.
	* sysdeps/s390/s390-64/bits/setjmp.h: New file.
	* sysdeps/s390/s390-64/bits/string.h: New file.
	* sysdeps/s390/s390-64/bsd-_setjmp.S: New file.
	* sysdeps/s390/s390-64/bsd-setjmp.S: New file.
	* sysdeps/s390/s390-64/bzero.S: New file.
	* sysdeps/s390/s390-64/dl-machine.h: New file.
	* sysdeps/s390/s390-64/elf/bsd-_setjmp.S: New file.
	* sysdeps/s390/s390-64/elf/bsd-setjmp.S: New file.
	* sysdeps/s390/s390-64/elf/setjmp.S: New file.
	* sysdeps/s390/s390-64/elf/start.S: New file.
	* sysdeps/s390/s390-64/ffs.c: New file.
	* sysdeps/s390/s390-64/initfini.c: New file.
	* sysdeps/s390/s390-64/memchr.S: New file.
	* sysdeps/s390/s390-64/memcpy.S: New file.
	* sysdeps/s390/s390-64/memset.S: New file.
	* sysdeps/s390/s390-64/s390x-mcount.S: New file.
	* sysdeps/s390/s390-64/setjmp.S: New file.
	* sysdeps/s390/s390-64/strcpy.S: New file.
	* sysdeps/s390/s390-64/strncpy.S: New file.
	* sysdeps/s390/s390-64/sub_n.S: New file.
	* sysdeps/s390/s390-64/sysdep.h: New file.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* scripts/config.guess: Add support for Linux on 64 bit S/390.
	* scripts/config.sub: Likewise.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* configure.in: Add support for 64 bit S/390.

	* elf/elf.h: Add new relocations for 64 bit S/390.

	* shlib-versions: Add rules for Linux on 64 bit S/390.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* sysdeps/s390/__longjmp.c: Move to...
	* sysdeps/s390/s390-32/__longjmp.c: ...here.  Add code
	to load the floating point registers that should be saved
	according to the ABI.

	* sysdeps/s390/bits/setjmp.h: Move to...
	* sysdeps/s390/s390-32/bits/setjmp.h: ...here.  Avoid
	the use of long long in the __jmp_buf type definition.

	* sysdeps/s390/bits/string.h: Move to...
	* sysdeps/s390/s390-32/bits/string.h: ...here.  Add several missing
	#ifndef _FORCE_INLINES.

	* sysdeps/s390/dl-machine.h: Move to...
	* sysdeps/s390/s390-32/dl-machine.h: ...here.  Add a check for the
	executables EI_CLASS in elf_machine_matches_host.

	* sysdeps/s390/elf/setjmp.S: Move to...
	* sysdeps/s390/s390-32/elf/setjmp.S: ...here.  Replace
	branches to globally defined symbol __sigsetjmp by branches to
	a local label (this avoids the generation of a R_390_PC16DBL
	relocation in -fpic code).

	* sysdeps/s390/gmp-mparam.h: Use defines from <bits/wordsize.h> to
	calculate BITS_PER_MP_LIMB, BYTES_PER_MP_LIMB and BITS_PER_LONGINT.

	* sysdeps/s390/initfini.c: Move to...
	* sysdeps/s390/s390-32/initfini.c: ...here.  Replace ALIGN with
	".align 4,0x07".

	* sysdeps/s390/setjmp.S: Move to...
	* sysdeps/s390/s390-32/setjmp.S: ...here.  Add code to store the
	floating point registers that should be saved according to the ABI.

	* sysdeps/s390/sys/ucontext.h: Remove since it is unused.

	* sysdeps/unix/sysv/linux/s390/sysdep.h: Move to...
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: ...here. Include
	sysdeps/s390/s390-32/sysdep.h instead of sysdeps/s390/sysdep.h.

2001-03-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* configure.in: Change machine=s390 to machine=s390/s390-32.

	* elf/elf.h: Correct comment for R_390_PLT16DBL.

4 files changed, 0 insertions, 355 deletions

diff --git a/sysdeps/s390/bits/byteswap.h b/sysdeps/s390/bits/byteswap.h
deleted file mode 100644
index ad20e97dc6..0000000000
--- a/sysdeps/s390/bits/byteswap.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Macros to swap the order of bytes in integer values.  s390 version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
-   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 Library General Public License as
-   published by the Free Software Foundation; either version 2 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#if !defined _BYTESWAP_H && !defined _NETINET_IN_H
-# error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
-#endif
-
-#define __bswap_constant_16(x) \
-     ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
-
-/* Swap bytes in 16 bit value. */
-#if defined __GNUC__ && __GNUC__ >= 2
-# define __bswap_16(x) \
-     (__extension__							      \
-      ({ unsigned short int __v;		                              \
-	 if (__builtin_constant_p (x))					      \
-	   __v = __bswap_constant_16 (x);				      \
-	 else {								      \
-           unsigned short int __tmp = (unsigned short int) (x);               \
-           __asm__ __volatile__ (                                             \
-              "sr   %0,%0\n"                                                  \
-              "la   1,%1\n"                                                   \
-              "icm  %0,2,1(1)\n"                                              \
-              "ic   %0,0(1)"                                                  \
-              : "=&d" (__v) : "m" (__tmp) : "1");                             \
-         }                                                                    \
-	 __v; }))
-#else
-/* This is better than nothing.  */
-#define __bswap_16(x) __bswap_constant_16 (x)
-#endif
-
-/* Swap bytes in 32 bit value.  */
-#define __bswap_constant_32(x) \
-     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) |		      \
-      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
-
-#if defined __GNUC__ && __GNUC__ >= 2
-#  define __bswap_32(x) \
-     (__extension__							      \
-      ({ unsigned int __v;				                      \
-	 if (__builtin_constant_p (x))					      \
-	   __v = __bswap_constant_32 (x);				      \
-	 else {								      \
-           unsigned int __tmp = (unsigned int) (x);                           \
-           __asm__ __volatile__ (                                             \
-              "la    1,%1\n"                                                  \
-              "icm   %0,8,3(1)\n"                                             \
-              "icm   %0,4,2(1)\n"                                             \
-              "icm   %0,2,1(1)\n"                                             \
-              "ic    %0,0(1)"                                                 \
-              : "=&d" (__v) : "m" (__tmp) : "1");                             \
-         }                                                                    \
-	 __v; }))
-#else
-# define __bswap_32(x) __bswap_constant_32 (x)
-#endif
-
-#if defined __GNUC__ && __GNUC__ >= 2
-/* Swap bytes in 64 bit value.  */
-# define __bswap_64(x) \
-  __extension__						\
-  ({ union { unsigned long long int __ll;		\
-	     unsigned long int __l[2]; } __w, __r;	\
-     __w.__ll = (x);					\
-     __r.__l[0] = __bswap_32 (__w.__l[1]);		\
-     __r.__l[1] = __bswap_32 (__w.__l[0]);		\
-     __r.__ll; })
-#endif
diff --git a/sysdeps/s390/bits/huge_val.h b/sysdeps/s390/bits/huge_val.h
deleted file mode 100644
index 0c8264c90f..0000000000
--- a/sysdeps/s390/bits/huge_val.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* `HUGE_VAL' constants for s390 (where it is infinity).
-   Used by <stdlib.h> and <math.h> functions for overflow.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
-   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 Library General Public License as
-   published by the Free Software Foundation; either version 2 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-#include <features.h>
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity).  */
-
-#if __GNUC_PREREQ(2,96)
-# define HUGE_VAL	(__extension__ 0x1.0p2047)
-#else
-#define	__HUGE_VAL_bytes	{ 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
-
-#define __huge_val_t	union { unsigned char __c[8]; double __d; }
-#ifdef	__GNUC__
-# define HUGE_VAL	(__extension__ \
-			 ((__huge_val_t) { __c: __HUGE_VAL_bytes }).__d)
-#else	/* Not GCC.  */
-static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL	(__huge_val.__d)
-#endif	/* GCC.  */
-#endif /* GCC 2.95 */
-
-
-/* ISO C 99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL.  */
-
-#ifdef __USE_ISOC99
-
-# if __GNUC_PREREQ(2,96)
-
-#  define HUGE_VALF (__extension__ 0x1.0p255f)
-#  define HUGE_VALL (__extension__ 0x1.0p255f)
-
-# else
-
-# define __HUGE_VALF_bytes	{ 0x7f, 0x80, 0, 0 }
-
-# define __huge_valf_t	union { unsigned char __c[4]; float __f; }
-# ifdef	__GNUC__
-#  define HUGE_VALF	(__extension__ \
-			 ((__huge_valf_t) { __c: __HUGE_VALF_bytes }).__f)
-# else	/* Not GCC.  */
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-#  define HUGE_VALF	(__huge_valf.__f)
-# endif	/* GCC.  */
-
-/* On 390 there is no 'long double' format. Make it the same as 'double' */
-# define HUGE_VALL HUGE_VAL
-
-# endif /* GCC 2.95 */
-
-#endif	/* __USE_ISOC99.  */
diff --git a/sysdeps/s390/bits/setjmp.h b/sysdeps/s390/bits/setjmp.h
deleted file mode 100644
index 0e4e36e713..0000000000
--- a/sysdeps/s390/bits/setjmp.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2000 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 Library General Public License as
-   published by the Free Software Foundation; either version 2 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Define the machine-dependent type `jmp_buf'.  IBM s390 version.  */
-
-#ifndef __S390_SETJMP_H__
-#define __S390_SETJMP_H__
-
-#define __JB_GPR6	0
-#define __JB_GPR7	1
-#define __JB_GPR8	2
-#define __JB_GPR9	3
-#define __JB_GPR10	4
-#define __JB_GPR11	5
-#define __JB_GPR12	6
-#define __JB_GPR13	7
-#define __JB_GPR14	8
-#define __JB_GPR15	9
-
-#ifndef	_ASM
-
-typedef struct {
-    /* We save registers 6-15.  */
-    long int gregs[10];
-
-    /* We save fpu registers 4 and 6.  */
-    long long fpregs[2];
-} __jmp_buf[1];
-
-#endif
-
-/* Test if longjmp to JMPBUF would unwind the frame
-   containing a local variable at ADDRESS.  */
-#define _JMPBUF_UNWINDS(jmpbuf, address) \
-  ((int) (address) < (jmpbuf)->gregs[__JB_GPR15])
-
-#endif /* __S390_SETJMP_H__ */
diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h
deleted file mode 100644
index 791f939225..0000000000
--- a/sysdeps/s390/bits/string.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Optimized, inlined string functions.	 s390 version.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
-   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 Library General Public License as
-   published by the Free Software Foundation; either version 2 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.	*/
-
-#ifndef _STRING_H
-# error "Never use <bits/string.h> directly; include <string.h> instead."
-#endif
-
-/* The s390 processors can access unaligned multi-byte variables.  */
-#define _STRING_ARCH_unaligned	1
-
-
-/* We only provide optimizations if the user selects them and if
-   GNU CC is used.  */
-#if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \
-    && defined __GNUC__ && __GNUC__ >= 2
-
-#ifndef __STRING_INLINE
-# ifdef __cplusplus
-#  define __STRING_INLINE inline
-# else
-#  define __STRING_INLINE extern __inline
-# endif
-#endif
-
-#define _HAVE_STRING_ARCH_strlen 1
-__STRING_INLINE size_t
-strlen (__const char *__str)
-{
-    size_t __len;
-
-    __asm__ __volatile__ ("   sr    0,0\n"
-			  "   lr    %0,%1\n"
-			  "0: srst  0,%0\n"
-			  "   jo    0b\n"
-			  "   lr    %0,0\n"
-			  "   sr    %0,%1"
-			  : "=&a" (__len) : "a" (__str)
-			  : "cc", "0" );
-    return __len;
-}
-
-/* Copy SRC to DEST.  */
-#define _HAVE_STRING_ARCH_strcpy 1
-__STRING_INLINE char *
-strcpy (char *__dest, __const char *__src)
-{
-    char *tmp = __dest;
-
-    __asm__ __volatile__ ("   sr    0,0\n"
-			  "0: mvst  %0,%1\n"
-			  "   jo    0b"
-			  : "+&a" (__dest), "+&a" (__src) :
-			  : "cc", "memory", "0" );
-    return tmp;
-}
-
-#define _HAVE_STRING_ARCH_strncpy 1
-__STRING_INLINE char *
-strncpy (char *__dest, __const char *__src, size_t __n)
-{
-    char *tmp = __dest;
-
-    if (__n <= 0)
-	return tmp;
-    __asm__ __volatile ("   slr	 %0,%1\n"
-			"0: icm	 0,1,0(%1)\n"
-			"   stc	 0,0(%0,%1)\n"
-			"   jz	 2f\n"
-			"   la	 %1,1(%1)\n"
-			"   brct %2,0b\n"
-			"   j	 3f\n"
-			"1: la	 %1,1(%1)\n"
-			"   stc	 0,0(%0,%1)\n"
-			"2: brct %2,1b\n"
-			"3:"
-			: "+&a" (__dest), "+&a" (__src), "+&d" (__n) :
-			: "cc", "memory", "0" );
-    return tmp;
-}
-
-/* Append SRC onto DEST.  */
-#define _HAVE_STRING_ARCH_strcat 1
-__STRING_INLINE char *
-strcat(char *__dest, const char *__src)
-{
-    char *tmp = __dest;
-
-    __asm__ __volatile__ ("   sr   0,0\n"
-			  "0: srst 0,%0\n"
-			  "   jo   0b\n"
-			  "   lr   %0,0\n"
-			  "   sr   0,0\n"
-			  "1: mvst %0,%1\n"
-			  "   jo   1b"
-			  : "+&a" (__dest), "+&a" (__src) :
-			  : "cc", "memory", "0" );
-    return tmp;
-}
-
-/* Append no more than N characters from SRC onto DEST.	 */
-#define _HAVE_STRING_ARCH_strncat 1
-__STRING_INLINE char *
-strncat (char *__dest, __const char *__src, size_t __n)
-{
-    char *tmp = __dest;
-
-    if (__n <= 0)
-	return tmp;
-    __asm__ __volatile__ ("   sr   0,0\n"
-			  "0: srst 0,%0\n"
-			  "   jo   0b\n"
-			  "   lr   %0,0\n"
-			  "   slr  %0,%1\n"
-			  "1: icm  0,1,0(%1)\n"
-			  "   stc  0,0(%0,%1)\n"
-			  "   jz   2f\n"
-			  "   la   %1,1(%1)\n"
-			  "   brct %2,1b\n"
-			  "   la   %0,0(%0,%1)\n"
-			  "   xc   0(1,%0),0(%0)\n"
-			  "2:"
-			  : "+&a" (__dest), "+&a" (__src), "+&d" (__n) :
-			  : "cc", "memory", "0" );
-    return tmp;
-}
-
-#endif	/* Use string inlines && GNU CC.  */