diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-18 02:24:59 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-18 02:24:59 +0000 |
| commit | 33f3f8954d202664c7c7a224d13ba5a0c14a0e01 (patch) | |
| tree | e0f840c6480989b155a172c09109241a7be183e7 /ports/sysdeps/unix/sysv/linux/alpha/utimes.S | |
| parent | fa83b30737d538378a98cab7fbc982ae3f8ac442 (diff) | |
Merge changes between r17050 and r17194 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17195 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'ports/sysdeps/unix/sysv/linux/alpha/utimes.S')
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/utimes.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/utimes.S b/ports/sysdeps/unix/sysv/linux/alpha/utimes.S index 0dd0a9372..2ab2b19c0 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/utimes.S +++ b/ports/sysdeps/unix/sysv/linux/alpha/utimes.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2003, 2006, 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 @@ -23,7 +23,7 @@ .text -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING #define UTIMES __utimes_tv64 #else #define UTIMES __utimes @@ -110,7 +110,7 @@ $error: END(UTIMES) #endif /* __ASSUME_TIMEVAL64 */ -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined PIC && defined DO_VERSIONING default_symbol_version (__utimes_tv64, __utimes, GLIBC_2.1) /* It seems to me to be a misfeature of the assembler that we can only |