diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-08-01 11:39:08 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-08-01 11:39:08 -0700 |
| commit | 5d9eaeecb451dc85479c1905d41a0b41c6d8b1d0 (patch) | |
| tree | a3fe4a7f22734e3b561ef543944c147580c60f03 | |
| parent | b8625cfc6f629f146aa3944b5cfc65025884bd44 (diff) | |
| download | glibc-5d9eaeecb451dc85479c1905d41a0b41c6d8b1d0.tar.gz glibc-5d9eaeecb451dc85479c1905d41a0b41c6d8b1d0.tar.xz glibc-5d9eaeecb451dc85479c1905d41a0b41c6d8b1d0.zip | |
Move Linuxism out of sysdeps/arm/dl-machine.h.
| -rw-r--r-- | ports/ChangeLog.arm | 4 | ||||
| -rw-r--r-- | ports/sysdeps/arm/dl-machine.h | 8 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/arm/dl-machine.h | 28 |
3 files changed, 36 insertions, 4 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 2b109db332..bbf9c68127 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,5 +1,9 @@ 2012-08-01 Roland McGrath <roland@hack.frob.com> + * sysdeps/arm/dl-machine.h (CLEAR_CACHE): Don't define it. + Instead, #error if it's not defined. + * sysdeps/unix/sysv/linux/arm/dl-machine.h: New file. + [BZ #14138] * sysdeps/unix/sysv/linux/arm/getrlimit.c: File removed. diff --git a/ports/sysdeps/arm/dl-machine.h b/ports/sysdeps/arm/dl-machine.h index 8d905e8ad9..442fc3ddcd 100644 --- a/ports/sysdeps/arm/dl-machine.h +++ b/ports/sysdeps/arm/dl-machine.h @@ -1,6 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. ARM version. - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, - 2006, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1995-2012 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 @@ -27,8 +26,9 @@ #include <dl-tlsdesc.h> #include <dl-irel.h> -#define CLEAR_CACHE(BEG,END) \ - INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0) +#ifndef CLEAR_CACHE +# error CLEAR_CACHE definition required to handle TEXTREL +#endif /* Return nonzero iff ELF header is compatible with the running host. */ static inline int __attribute__ ((unused)) diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h b/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h new file mode 100644 index 0000000000..7c96cb754f --- /dev/null +++ b/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h @@ -0,0 +1,28 @@ +/* Machine-dependent ELF dynamic relocation inline functions. ARM/Linux version + Copyright (C) 1995-2012 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, see + <http://www.gnu.org/licenses/>. */ + +#ifndef dl_machine_h + +/* This definition is Linux-specific. */ +#define CLEAR_CACHE(BEG,END) \ + INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0) + +/* The rest is just machine-specific. */ +#include <sysdeps/arm/dl-machine.h> + +#endif |