Merge changes between r18761 and r18832 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@18833 7b3dc134-2b1b-0410-93df-9e9f96275f8d

6 files changed, 315 insertions, 13 deletions

diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist
index 8fd2ab065..4e2b582f1 100644
--- a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist
+++ b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist
@@ -8,6 +8,7 @@ GLIBC_2.0
  realloc F
 GLIBC_2.1
  GLIBC_2.1 A
+ __libc_stack_end D 0x4
  _dl_mcount F
 GLIBC_2.3
  GLIBC_2.3 A
diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist
index 728550bdf..d56560112 100644
--- a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist
+++ b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist
@@ -253,9 +253,7 @@ GLIBC_2.0
  __xpg_basename F
  __xstat F
  _environ D 0x4
- _errno D 0x4
  _exit F
- _h_errno D 0x4
  _libc_intl_domainname D 0x5
  _longjmp F
  _mcleanup F
@@ -418,7 +416,6 @@ GLIBC_2.0
  erand48 F
  erand48_r F
  err F
- errno D 0x4
  error F
  error_at_line F
  error_message_count D 0x4
@@ -644,7 +641,6 @@ GLIBC_2.0
  gsignal F
  gtty F
  h_errlist D 0x14
- h_errno D 0x4
  h_nerr D 0x4
  hasmntopt F
  hcreate F
@@ -1694,7 +1690,6 @@ GLIBC_2.10
  accept4 F
  endsgent F
  fallocate F
- fallocate64 F
  fgetsgent F
  fgetsgent_r F
  getsgent F
@@ -1719,6 +1714,7 @@ GLIBC_2.11
  GLIBC_2.11 A
  __longjmp_chk F
  execvpe F
+ fallocate64 F
  mkostemps F
  mkostemps64 F
  mkstemps F
@@ -1733,7 +1729,6 @@ GLIBC_2.12
  sys_nerr D 0x4
 GLIBC_2.13
  GLIBC_2.13 A
- __fentry__ F
  fanotify_init F
  fanotify_mark F
  prlimit F
@@ -2079,6 +2074,7 @@ GLIBC_2.3.2
  strptime_l F
 GLIBC_2.3.3
  GLIBC_2.3.3 A
+ _sys_siglist D 0x104
  gnu_dev_major F
  gnu_dev_makedev F
  gnu_dev_minor F
@@ -2090,10 +2086,14 @@ GLIBC_2.3.3
  inet6_option_space F
  nftw F
  nftw64 F
+ posix_fadvise64 F
+ posix_fallocate64 F
  remap_file_pages F
  sched_getaffinity F
  sched_setaffinity F
  semtimedop F
+ sys_sigabbrev D 0x104
+ sys_siglist D 0x104
 GLIBC_2.3.4
  GLIBC_2.3.4 A
  __chk_fail F
@@ -2127,11 +2127,21 @@ GLIBC_2.3.4
  xdr_u_quad_t F
 GLIBC_2.4
  GLIBC_2.4 A
+ _IO_fprintf F
+ _IO_printf F
+ _IO_sprintf F
+ _IO_sscanf F
+ _IO_vfprintf F
+ _IO_vfscanf F
+ _IO_vsprintf F
+ __asprintf F
  __confstr_chk F
  __fgets_chk F
  __fgets_unlocked_chk F
  __fgetws_chk F
  __fgetws_unlocked_chk F
+ __finitel F
+ __fprintf_chk F
  __fwprintf_chk F
  __fxstatat F
  __fxstatat64 F
@@ -2141,23 +2151,108 @@ GLIBC_2.4
  __gethostname_chk F
  __getlogin_r_chk F
  __getwd_chk F
+ __isinfl F
+ __isnanl F
  __mbsnrtowcs_chk F
  __mbsrtowcs_chk F
  __mbstowcs_chk F
+ __nldbl__IO_fprintf F
+ __nldbl__IO_printf F
+ __nldbl__IO_sprintf F
+ __nldbl__IO_sscanf F
+ __nldbl__IO_vfprintf F
+ __nldbl__IO_vfscanf F
+ __nldbl__IO_vsprintf F
+ __nldbl___asprintf F
+ __nldbl___fprintf_chk F
+ __nldbl___fwprintf_chk F
+ __nldbl___printf_chk F
+ __nldbl___printf_fp F
+ __nldbl___snprintf_chk F
+ __nldbl___sprintf_chk F
+ __nldbl___strfmon_l F
+ __nldbl___swprintf_chk F
+ __nldbl___syslog_chk F
+ __nldbl___vfprintf_chk F
+ __nldbl___vfscanf F
+ __nldbl___vfwprintf_chk F
+ __nldbl___vprintf_chk F
+ __nldbl___vsnprintf F
+ __nldbl___vsnprintf_chk F
+ __nldbl___vsprintf_chk F
+ __nldbl___vsscanf F
+ __nldbl___vstrfmon F
+ __nldbl___vstrfmon_l F
+ __nldbl___vswprintf_chk F
+ __nldbl___vsyslog_chk F
+ __nldbl___vwprintf_chk F
+ __nldbl___wprintf_chk F
+ __nldbl_asprintf F
+ __nldbl_dprintf F
+ __nldbl_fprintf F
+ __nldbl_fscanf F
+ __nldbl_fwprintf F
+ __nldbl_fwscanf F
+ __nldbl_obstack_printf F
+ __nldbl_obstack_vprintf F
+ __nldbl_printf F
+ __nldbl_printf_size F
+ __nldbl_scanf F
+ __nldbl_snprintf F
+ __nldbl_sprintf F
+ __nldbl_sscanf F
+ __nldbl_strfmon F
+ __nldbl_strfmon_l F
+ __nldbl_swprintf F
+ __nldbl_swscanf F
+ __nldbl_syslog F
+ __nldbl_vasprintf F
+ __nldbl_vdprintf F
+ __nldbl_vfprintf F
+ __nldbl_vfscanf F
+ __nldbl_vfwprintf F
+ __nldbl_vfwscanf F
+ __nldbl_vprintf F
+ __nldbl_vscanf F
+ __nldbl_vsnprintf F
+ __nldbl_vsprintf F
+ __nldbl_vsscanf F
+ __nldbl_vswprintf F
+ __nldbl_vswscanf F
+ __nldbl_vsyslog F
+ __nldbl_vwprintf F
+ __nldbl_vwscanf F
+ __nldbl_wprintf F
+ __nldbl_wscanf F
  __pread64_chk F
  __pread_chk F
+ __printf_chk F
+ __printf_fp F
  __ptsname_r_chk F
  __read_chk F
  __readlink_chk F
  __realpath_chk F
  __recv_chk F
  __recvfrom_chk F
+ __signbitl F
+ __snprintf_chk F
+ __sprintf_chk F
  __stack_chk_fail F
  __stpncpy_chk F
+ __strfmon_l F
+ __strtold_internal F
+ __strtold_l F
  __swprintf_chk F
  __syslog_chk F
  __ttyname_r_chk F
+ __vfprintf_chk F
+ __vfscanf F
  __vfwprintf_chk F
+ __vprintf_chk F
+ __vsnprintf F
+ __vsnprintf_chk F
+ __vsprintf_chk F
+ __vsscanf F
  __vswprintf_chk F
  __vsyslog_chk F
  __vwprintf_chk F
@@ -2170,6 +2265,8 @@ GLIBC_2.4
  __wcsncpy_chk F
  __wcsnrtombs_chk F
  __wcsrtombs_chk F
+ __wcstold_internal F
+ __wcstold_l F
  __wcstombs_chk F
  __wctomb_chk F
  __wmemcpy_chk F
@@ -2180,29 +2277,83 @@ GLIBC_2.4
  __xmknodat F
  _sys_errlist D 0x210
  _sys_nerr D 0x4
+ asprintf F
+ copysignl F
+ dprintf F
  eaccess F
  faccessat F
  fchmodat F
  fchownat F
  fdopendir F
+ finitel F
+ fprintf F
+ frexpl F
+ fscanf F
  futimesat F
+ fwprintf F
+ fwscanf F
  inotify_add_watch F
  inotify_init F
  inotify_rm_watch F
+ isinfl F
+ isnanl F
+ ldexpl F
  linkat F
  mkdirat F
  mkfifoat F
+ modfl F
+ obstack_printf F
+ obstack_vprintf F
  open_wmemstream F
  openat F
  openat64 F
  ppoll F
+ printf F
+ printf_size F
+ qecvt F
+ qecvt_r F
+ qfcvt F
+ qfcvt_r F
+ qgcvt F
  readlinkat F
  renameat F
+ scalbnl F
+ scanf F
+ snprintf F
+ sprintf F
+ sscanf F
+ strfmon F
+ strfmon_l F
+ strtold F
+ strtold_l F
+ swprintf F
+ swscanf F
  symlinkat F
  sys_errlist D 0x210
  sys_nerr D 0x4
+ syslog F
  unlinkat F
  unshare F
+ vasprintf F
+ vdprintf F
+ vfprintf F
+ vfscanf F
+ vfwprintf F
+ vfwscanf F
+ vprintf F
+ vscanf F
+ vsnprintf F
+ vsprintf F
+ vsscanf F
+ vswprintf F
+ vswscanf F
+ vsyslog F
+ vwprintf F
+ vwscanf F
+ wcstold F
+ wcstold_l F
+ wprintf F
+ wscanf F
 GLIBC_2.5
  GLIBC_2.5 A
  __readlinkat_chk F
@@ -2247,6 +2398,18 @@ GLIBC_2.7
  __isoc99_vswscanf F
  __isoc99_vwscanf F
  __isoc99_wscanf F
+ __nldbl___isoc99_fscanf F
+ __nldbl___isoc99_fwscanf F
+ __nldbl___isoc99_scanf F
+ __nldbl___isoc99_sscanf F
+ __nldbl___isoc99_swscanf F
+ __nldbl___isoc99_vfscanf F
+ __nldbl___isoc99_vfwscanf F
+ __nldbl___isoc99_vscanf F
+ __nldbl___isoc99_vsscanf F
+ __nldbl___isoc99_vswscanf F
+ __nldbl___isoc99_vwscanf F
+ __nldbl___isoc99_wscanf F
  __open64_2 F
  __open_2 F
  __openat64_2 F
@@ -2263,6 +2426,12 @@ GLIBC_2.8
  GLIBC_2.8 A
  __asprintf_chk F
  __dprintf_chk F
+ __nldbl___asprintf_chk F
+ __nldbl___dprintf_chk F
+ __nldbl___obstack_printf_chk F
+ __nldbl___obstack_vprintf_chk F
+ __nldbl___vasprintf_chk F
+ __nldbl___vdprintf_chk F
  __obstack_printf_chk F
  __obstack_vprintf_chk F
  __vasprintf_chk F
@@ -2275,5 +2444,20 @@ GLIBC_2.9
  GLIBC_2.9 A
  dup3 F
  epoll_create1 F
+ getutent F
+ getutent_r F
+ getutid F
+ getutid_r F
+ getutline F
+ getutline_r F
+ getutmp F
+ getutmpx F
+ getutxent F
+ getutxid F
+ getutxline F
  inotify_init1 F
  pipe2 F
+ pututline F
+ pututxline F
+ updwtmp F
+ updwtmpx F
diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist
index 770f222aa..ae8af50eb 100644
--- a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist
+++ b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist
@@ -398,3 +398,107 @@ GLIBC_2.2
  fedisableexcept F
  feenableexcept F
  fegetexcept F
+GLIBC_2.4
+ GLIBC_2.4 A
+ __clog10l F
+ __finitel F
+ __fpclassifyl F
+ __nldbl_nexttowardf F
+ __signbitl F
+ acoshl F
+ acosl F
+ asinhl F
+ asinl F
+ atan2l F
+ atanhl F
+ atanl F
+ cabsl F
+ cacoshl F
+ cacosl F
+ cargl F
+ casinhl F
+ casinl F
+ catanhl F
+ catanl F
+ cbrtl F
+ ccoshl F
+ ccosl F
+ ceill F
+ cexpl F
+ cimagl F
+ clog10l F
+ clogl F
+ conjl F
+ copysignl F
+ coshl F
+ cosl F
+ cpowl F
+ cprojl F
+ creall F
+ csinhl F
+ csinl F
+ csqrtl F
+ ctanhl F
+ ctanl F
+ dreml F
+ erfcl F
+ erfl F
+ exp10l F
+ exp2l F
+ expl F
+ expm1l F
+ fabsl F
+ fdiml F
+ finitel F
+ floorl F
+ fmal F
+ fmaxl F
+ fminl F
+ fmodl F
+ frexpl F
+ gammal F
+ hypotl F
+ ilogbl F
+ j0l F
+ j1l F
+ jnl F
+ ldexpl F
+ lgammal F
+ lgammal_r F
+ llrintl F
+ llroundl F
+ log10l F
+ log1pl F
+ log2l F
+ logbl F
+ logl F
+ lrintl F
+ lroundl F
+ modfl F
+ nanl F
+ nearbyintl F
+ nextafterl F
+ nexttoward F
+ nexttowardf F
+ nexttowardl F
+ pow10l F
+ powl F
+ remainderl F
+ remquol F
+ rintl F
+ roundl F
+ scalbl F
+ scalblnl F
+ scalbnl F
+ significandl F
+ sincosl F
+ sinhl F
+ sinl F
+ sqrtl F
+ tanhl F
+ tanl F
+ tgammal F
+ truncl F
+ y0l F
+ y1l F
+ ynl F
diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist
index 68bd978be..827114f89 100644
--- a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist
+++ b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist
@@ -230,6 +230,23 @@ GLIBC_2.3.2
  pthread_cond_signal F
  pthread_cond_timedwait F
  pthread_cond_wait F
+GLIBC_2.3.3
+ GLIBC_2.3.3 A
+ __pthread_cleanup_routine F
+ __pthread_register_cancel F
+ __pthread_register_cancel_defer F
+ __pthread_unregister_cancel F
+ __pthread_unregister_cancel_restore F
+ __pthread_unwind_next F
+ pthread_attr_getaffinity_np F
+ pthread_attr_setaffinity_np F
+ pthread_barrierattr_getpshared F
+ pthread_condattr_getclock F
+ pthread_condattr_setclock F
+ pthread_getaffinity_np F
+ pthread_setaffinity_np F
+ pthread_timedjoin_np F
+ pthread_tryjoin_np F
 GLIBC_2.3.4
  GLIBC_2.3.4 A
  pthread_attr_getaffinity_np F
diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist
index 371d135c8..af7df27cb 100644
--- a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist
+++ b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist
@@ -31,13 +31,6 @@ GLIBC_2.2
  timer_getoverrun F
  timer_gettime F
  timer_settime F
-GLIBC_2.3.3
- GLIBC_2.3.3 A
- timer_create F
- timer_delete F
- timer_getoverrun F
- timer_gettime F
- timer_settime F
 GLIBC_2.3.4
  GLIBC_2.3.4 A
  mq_close F
diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist
index 7422687e3..9dc14a5f8 100644
--- a/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist
+++ b/libc/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist
@@ -6,3 +6,6 @@ GLIBC_2.0
  logout F
  logwtmp F
  openpty F
+GLIBC_2.9
+ GLIBC_2.9 A
+ login F