src/patches/glibc/glibc-rh1099025-2.patch

   1 commit d6c33fda03457ca8ca87a562fa2681af16ca4ea5
   2 Author: Roland McGrath <roland@hack.frob.com>
   3 Date:   Thu May 24 11:37:30 2012 -0700
   4
   5     Switch gettimeofday from INTUSE to libc_hidden_proto.
   6
   7 diff --git a/include/sys/time.h b/include/sys/time.h
   8 index d5de942..599e189 100644
   9 --- a/include/sys/time.h
  10 +++ b/include/sys/time.h
  11 @@ -4,9 +4,8 @@
  12  /* Now document the internal interfaces.  */
  13  extern int __gettimeofday (struct timeval *__tv,
  14                            struct timezone *__tz);
  15 -extern int __gettimeofday_internal (struct timeval *__tv,
  16 -                                   struct timezone *__tz)
  17 -       attribute_hidden;
  18 +libc_hidden_proto (__gettimeofday)
  19 +libc_hidden_proto (gettimeofday)
  20  extern int __settimeofday (__const struct timeval *__tv,
  21                            __const struct timezone *__tz)
  22         attribute_hidden;
  23 @@ -22,8 +21,4 @@ extern int __utimes (const char *__file, const struct timeval __tvp[2])
  24         attribute_hidden;
  25  extern int __futimes (int fd, __const struct timeval tvp[2]) attribute_hidden;
  26
  27 -#ifndef NOT_IN_libc
  28 -# define __gettimeofday(tv, tz) INTUSE(__gettimeofday) (tv, tz)
  29 -#endif
  30 -
  31  #endif
  32 diff --git a/sysdeps/mach/gettimeofday.c b/sysdeps/mach/gettimeofday.c
  33 index 88dca8e..293a775 100644
  34 --- a/sysdeps/mach/gettimeofday.c
  35 +++ b/sysdeps/mach/gettimeofday.c
  36 @@ -20,8 +20,6 @@
  37  #include <sys/time.h>
  38  #include <mach.h>
  39
  40 -#undef __gettimeofday
  41 -
  42  /* Get the current time of day and timezone information,
  43     putting it into *TV and *TZ.  If TZ is NULL, *TZ is not filled.
  44     Returns 0 on success, -1 on errors.  */
  45 @@ -42,6 +40,6 @@ __gettimeofday (tv, tz)
  46      }
  47    return 0;
  48  }
  49 -
  50 -INTDEF(__gettimeofday)
  51 +libc_hidden_def (__gettimeofday)
  52  weak_alias (__gettimeofday, gettimeofday)
  53 +libc_hidden_weak (gettimeofday)
  54 diff --git a/sysdeps/posix/gettimeofday.c b/sysdeps/posix/gettimeofday.c
  55 index 31b3dd3..1108ff0 100644
  56 --- a/sysdeps/posix/gettimeofday.c
  57 +++ b/sysdeps/posix/gettimeofday.c
  58 @@ -19,8 +19,6 @@
  59  #include <time.h>
  60  #include <sys/time.h>
  61
  62 -#undef __gettimeofday
  63 -
  64  /* Get the current time of day and timezone information,
  65     putting it into *TV and *TZ.  If TZ is NULL, *TZ is not filled.
  66     Returns 0 on success, -1 on errors.  */
  67 @@ -66,6 +64,6 @@ __gettimeofday (tv, tz)
  68
  69    return 0;
  70  }
  71 -
  72 -INTDEF(__gettimeofday)
  73 +libc_hidden_def (__gettimeofday)
  74  weak_alias (__gettimeofday, gettimeofday)
  75 +libc_hidden_weak (gettimeofday)
  76 diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
  77 index 39c40ed..bd780f5 100644
  78 --- a/sysdeps/unix/common/syscalls.list
  79 +++ b/sysdeps/unix/common/syscalls.list
  80 @@ -5,7 +5,7 @@ getpid          -       getpid          Ei:     __getpid        getpid
  81  fchown         -       fchown          i:iii   __fchown        fchown
  82  ftruncate      -       ftruncate       i:ii    __ftruncate     ftruncate
  83  getrusage      -       getrusage       i:ip    __getrusage     getrusage
  84 -gettimeofday   -       gettimeofday    i:PP    __gettimeofday  gettimeofday __gettimeofday_internal
  85 +gettimeofday   -       gettimeofday    i:pP    __gettimeofday  gettimeofday
  86  settimeofday   -       settimeofday    i:PP    __settimeofday  settimeofday
  87  setpgid                -       setpgrp         i:ii    __setpgid       setpgid
  88  setregid       -       setregid        i:ii    __setregid      setregid
  89 diff --git a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
  90 index b2ef2da..7376135 100644
  91 --- a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
  92 +++ b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
  93 @@ -35,5 +35,6 @@ __gettimeofday (tv, tz)
  94  }
  95 -
  96 -#endif
  97 -INTDEF (__gettimeofday)
  98 +libc_hidden_def (__gettimeofday)
  99 +
 100 +#endif
 101  weak_alias (__gettimeofday, gettimeofday)
 102 +libc_hidden_weak (gettimeofday)
 103 diff --git a/sysdeps/unix/sysv/linux/s390/gettimeofday.c b/sysdeps/unix/sysv/linux/s390/gettimeofday.c
 104 index 63faef8..efbf1e8 100644
 105 --- a/sysdeps/unix/sysv/linux/s390/gettimeofday.c
 106 +++ b/sysdeps/unix/sysv/linux/s390/gettimeofday.c
 107 @@ -22,7 +22,6 @@
 108  #include <time.h>
 109  #include <hp-timing.h>
 110
 111 -#undef __gettimeofday
 112  #include <bits/libc-vdso.h>
 113
 114  /* Get the current time of day and timezone information,
 115 @@ -36,6 +35,6 @@ __gettimeofday (tv, tz)
 116  {
 117    return INLINE_VSYSCALL (gettimeofday, 2, CHECK_1 (tv), CHECK_1 (tz));
 118  }
 119 -
 120 -INTDEF (__gettimeofday)
 121 +libc_hidden_def (__gettimeofday)
 122  weak_alias (__gettimeofday, gettimeofday)
 123 +libc_hidden_weak (gettimeofday)
 124 diff --git a/time/gettimeofday.c b/time/gettimeofday.c
 125 index cfe6549..7eb770c 100644
 126 --- a/time/gettimeofday.c
 127 +++ b/time/gettimeofday.c
 128 @@ -18,8 +18,6 @@
 129  #include <errno.h>
 130  #include <sys/time.h>
 131
 132 -#undef __gettimeofday
 133 -
 134  /* Get the current time of day and timezone information,
 135     putting it into *TV and *TZ.  If TZ is NULL, *TZ is not filled.
 136     Returns 0 on success, -1 on errors.  */
 137 @@ -31,8 +29,9 @@ __gettimeofday (tv, tz)
 138    __set_errno (ENOSYS);
 139    return -1;
 140  }
 141 -stub_warning (gettimeofday)
 142 -
 143 -INTDEF(__gettimeofday)
 144 +libc_hidden_def (__gettimeofday)
 145  weak_alias (__gettimeofday, gettimeofday)
 146 +libc_hidden_weak (gettimeofday)
 147 +
 148 +stub_warning (gettimeofday)
 149  #include <stub-tag.h>
 150 --- a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S     2014-07-28 14:40:24.640144825 +0530
 151 +++ b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S     2014-07-28 14:40:21.320120072 +0530
 152 @@ -45,5 +45,6 @@
 153         ret
 154  PSEUDO_END(__gettimeofday)
 155
 156 -strong_alias (__gettimeofday, __gettimeofday_internal)
 157 +libc_hidden_def (__gettimeofday)
 158  weak_alias (__gettimeofday, gettimeofday)
 159 +libc_hidden_weak (gettimeofday)