m68k: cleanup sysdep files

Use sysdep files in subdirectories instead of testing cpu macros.
This commit is contained in:
Andreas Schwab 2010-08-02 18:47:27 +02:00
parent 71feaf7206
commit 2aed4f91fd
7 changed files with 137 additions and 30 deletions

View File

@ -1,3 +1,15 @@
2010-08-02 Andreas Schwab <schwab@linux-m68k.org>
* 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.
* sysdeps/unix/sysv/linux/m68k/m680x0/sysdep.h: New file.
* sysdeps/unix/sysv/linux/m68k/sysdep.h: Don't include subordinate
sysdep files.
2010-06-24 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h (F_SETPIPE_SZ,

View File

@ -0,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__ */

View File

@ -0,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__ */

View File

@ -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__ */

View File

@ -0,0 +1,26 @@
/* 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>
#endif

View File

@ -0,0 +1,26 @@
/* 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>
#endif

View File

@ -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. */
@ -333,5 +328,3 @@ SYSCALL_ERROR_LABEL: \
even when statically linked. */
# define NEED_STATIC_SYSINFO_DSO 1
#endif
#endif