Simplify the abilist format

The new format lists the version on each line, as in:

	VERSION SYMBOL TYPE [VALUE]

This makes it easier to process the files with line-oriented tools.

The abilist files were converted with this awk script:

/^[^ ]/ { version = $1 }
/^ / { print version, substr($0, 2) }

And sorted under the "C" locale with sort.

10 files changed, 715 insertions, 725 deletions

diff --git a/sysdeps/nacl/ld.abilist b/sysdeps/nacl/ld.abilist
index 02944c3e65..242f6d0723 100644
--- a/sysdeps/nacl/ld.abilist
+++ b/sysdeps/nacl/ld.abilist
@@ -1,12 +1,11 @@
-GLIBC_2.22
- GLIBC_2.22 A
- __libc_memalign F
- __libc_stack_end D 0x4
- __stack_chk_guard D 0x4
- __tls_get_addr F
- _dl_mcount F
- _r_debug D 0x14
- calloc F
- free F
- malloc F
- realloc F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 __libc_memalign F
+GLIBC_2.22 __libc_stack_end D 0x4
+GLIBC_2.22 __stack_chk_guard D 0x4
+GLIBC_2.22 __tls_get_addr F
+GLIBC_2.22 _dl_mcount F
+GLIBC_2.22 _r_debug D 0x14
+GLIBC_2.22 calloc F
+GLIBC_2.22 free F
+GLIBC_2.22 malloc F
+GLIBC_2.22 realloc F
diff --git a/sysdeps/nacl/libBrokenLocale.abilist b/sysdeps/nacl/libBrokenLocale.abilist
index dee8cb950d..4c14da7995 100644
--- a/sysdeps/nacl/libBrokenLocale.abilist
+++ b/sysdeps/nacl/libBrokenLocale.abilist
@@ -1,3 +1,2 @@
-GLIBC_2.22
- GLIBC_2.22 A
- __ctype_get_mb_cur_max F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 __ctype_get_mb_cur_max F
diff --git a/sysdeps/nacl/libanl.abilist b/sysdeps/nacl/libanl.abilist
index 87313a3d3d..ab6f9d2b40 100644
--- a/sysdeps/nacl/libanl.abilist
+++ b/sysdeps/nacl/libanl.abilist
@@ -1,6 +1,5 @@
-GLIBC_2.22
- GLIBC_2.22 A
- gai_cancel F
- gai_error F
- gai_suspend F
- getaddrinfo_a F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 gai_cancel F
+GLIBC_2.22 gai_error F
+GLIBC_2.22 gai_suspend F
+GLIBC_2.22 getaddrinfo_a F
diff --git a/sysdeps/nacl/libcrypt.abilist b/sysdeps/nacl/libcrypt.abilist
index dba7399ed1..9bb645fe60 100644
--- a/sysdeps/nacl/libcrypt.abilist
+++ b/sysdeps/nacl/libcrypt.abilist
@@ -1,9 +1,8 @@
-GLIBC_2.22
- GLIBC_2.22 A
- crypt F
- crypt_r F
- encrypt F
- encrypt_r F
- fcrypt F
- setkey F
- setkey_r F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 crypt F
+GLIBC_2.22 crypt_r F
+GLIBC_2.22 encrypt F
+GLIBC_2.22 encrypt_r F
+GLIBC_2.22 fcrypt F
+GLIBC_2.22 setkey F
+GLIBC_2.22 setkey_r F
diff --git a/sysdeps/nacl/libdl.abilist b/sysdeps/nacl/libdl.abilist
index 90acf039e2..863946ef7b 100644
--- a/sysdeps/nacl/libdl.abilist
+++ b/sysdeps/nacl/libdl.abilist
@@ -1,11 +1,10 @@
-GLIBC_2.22
- GLIBC_2.22 A
- dladdr F
- dladdr1 F
- dlclose F
- dlerror F
- dlinfo F
- dlmopen F
- dlopen F
- dlsym F
- dlvsym F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 dladdr F
+GLIBC_2.22 dladdr1 F
+GLIBC_2.22 dlclose F
+GLIBC_2.22 dlerror F
+GLIBC_2.22 dlinfo F
+GLIBC_2.22 dlmopen F
+GLIBC_2.22 dlopen F
+GLIBC_2.22 dlsym F
+GLIBC_2.22 dlvsym F
diff --git a/sysdeps/nacl/libm.abilist b/sysdeps/nacl/libm.abilist
index 19c2d0161d..d1fd77ab7f 100644
--- a/sysdeps/nacl/libm.abilist
+++ b/sysdeps/nacl/libm.abilist
@@ -1,370 +1,369 @@
-GLIBC_2.22
- GLIBC_2.22 A
- _LIB_VERSION D 0x4
- __acos_finite F
- __acosf_finite F
- __acosh_finite F
- __acoshf_finite F
- __asin_finite F
- __asinf_finite F
- __atan2_finite F
- __atan2f_finite F
- __atanh_finite F
- __atanhf_finite F
- __clog10 F
- __clog10f F
- __clog10l F
- __cosh_finite F
- __coshf_finite F
- __exp10_finite F
- __exp10f_finite F
- __exp2_finite F
- __exp2f_finite F
- __exp_finite F
- __expf_finite F
- __finite F
- __finitef F
- __finitel F
- __fmod_finite F
- __fmodf_finite F
- __fpclassify F
- __fpclassifyf F
- __gamma_r_finite F
- __gammaf_r_finite F
- __hypot_finite F
- __hypotf_finite F
- __issignaling F
- __issignalingf F
- __j0_finite F
- __j0f_finite F
- __j1_finite F
- __j1f_finite F
- __jn_finite F
- __jnf_finite F
- __lgamma_r_finite F
- __lgammaf_r_finite F
- __log10_finite F
- __log10f_finite F
- __log2_finite F
- __log2f_finite F
- __log_finite F
- __logf_finite F
- __pow_finite F
- __powf_finite F
- __remainder_finite F
- __remainderf_finite F
- __scalb_finite F
- __scalbf_finite F
- __signbit F
- __signbitf F
- __sinh_finite F
- __sinhf_finite F
- __sqrt_finite F
- __sqrtf_finite F
- __y0_finite F
- __y0f_finite F
- __y1_finite F
- __y1f_finite F
- __yn_finite F
- __ynf_finite F
- acos F
- acosf F
- acosh F
- acoshf F
- acoshl F
- acosl F
- asin F
- asinf F
- asinh F
- asinhf F
- asinhl F
- asinl F
- atan F
- atan2 F
- atan2f F
- atan2l F
- atanf F
- atanh F
- atanhf F
- atanhl F
- atanl F
- cabs F
- cabsf F
- cabsl F
- cacos F
- cacosf F
- cacosh F
- cacoshf F
- cacoshl F
- cacosl F
- carg F
- cargf F
- cargl F
- casin F
- casinf F
- casinh F
- casinhf F
- casinhl F
- casinl F
- catan F
- catanf F
- catanh F
- catanhf F
- catanhl F
- catanl F
- cbrt F
- cbrtf F
- cbrtl F
- ccos F
- ccosf F
- ccosh F
- ccoshf F
- ccoshl F
- ccosl F
- ceil F
- ceilf F
- ceill F
- cexp F
- cexpf F
- cexpl F
- cimag F
- cimagf F
- cimagl F
- clog F
- clog10 F
- clog10f F
- clog10l F
- clogf F
- clogl F
- conj F
- conjf F
- conjl F
- copysign F
- copysignf F
- copysignl F
- cos F
- cosf F
- cosh F
- coshf F
- coshl F
- cosl F
- cpow F
- cpowf F
- cpowl F
- cproj F
- cprojf F
- cprojl F
- creal F
- crealf F
- creall F
- csin F
- csinf F
- csinh F
- csinhf F
- csinhl F
- csinl F
- csqrt F
- csqrtf F
- csqrtl F
- ctan F
- ctanf F
- ctanh F
- ctanhf F
- ctanhl F
- ctanl F
- drem F
- dremf F
- dreml F
- erf F
- erfc F
- erfcf F
- erfcl F
- erff F
- erfl F
- exp F
- exp10 F
- exp10f F
- exp10l F
- exp2 F
- exp2f F
- exp2l F
- expf F
- expl F
- expm1 F
- expm1f F
- expm1l F
- fabs F
- fabsf F
- fabsl F
- fdim F
- fdimf F
- fdiml F
- feclearexcept F
- fedisableexcept F
- feenableexcept F
- fegetenv F
- fegetexcept F
- fegetexceptflag F
- fegetround F
- feholdexcept F
- feraiseexcept F
- fesetenv F
- fesetexceptflag F
- fesetround F
- fetestexcept F
- feupdateenv F
- finite F
- finitef F
- finitel F
- floor F
- floorf F
- floorl F
- fma F
- fmaf F
- fmal F
- fmax F
- fmaxf F
- fmaxl F
- fmin F
- fminf F
- fminl F
- fmod F
- fmodf F
- fmodl F
- frexp F
- frexpf F
- frexpl F
- gamma F
- gammaf F
- gammal F
- hypot F
- hypotf F
- hypotl F
- ilogb F
- ilogbf F
- ilogbl F
- j0 F
- j0f F
- j0l F
- j1 F
- j1f F
- j1l F
- jn F
- jnf F
- jnl F
- ldexp F
- ldexpf F
- ldexpl F
- lgamma F
- lgamma_r F
- lgammaf F
- lgammaf_r F
- lgammal F
- lgammal_r F
- llrint F
- llrintf F
- llrintl F
- llround F
- llroundf F
- llroundl F
- log F
- log10 F
- log10f F
- log10l F
- log1p F
- log1pf F
- log1pl F
- log2 F
- log2f F
- log2l F
- logb F
- logbf F
- logbl F
- logf F
- logl F
- lrint F
- lrintf F
- lrintl F
- lround F
- lroundf F
- lroundl F
- matherr F
- modf F
- modff F
- modfl F
- nan F
- nanf F
- nanl F
- nearbyint F
- nearbyintf F
- nearbyintl F
- nextafter F
- nextafterf F
- nextafterl F
- nexttoward F
- nexttowardf F
- nexttowardl F
- pow F
- pow10 F
- pow10f F
- pow10l F
- powf F
- powl F
- remainder F
- remainderf F
- remainderl F
- remquo F
- remquof F
- remquol F
- rint F
- rintf F
- rintl F
- round F
- roundf F
- roundl F
- scalb F
- scalbf F
- scalbl F
- scalbln F
- scalblnf F
- scalblnl F
- scalbn F
- scalbnf F
- scalbnl F
- signgam D 0x4
- significand F
- significandf F
- significandl F
- sin F
- sincos F
- sincosf F
- sincosl F
- sinf F
- sinh F
- sinhf F
- sinhl F
- sinl F
- sqrt F
- sqrtf F
- sqrtl F
- tan F
- tanf F
- tanh F
- tanhf F
- tanhl F
- tanl F
- tgamma F
- tgammaf F
- tgammal F
- trunc F
- truncf F
- truncl F
- y0 F
- y0f F
- y0l F
- y1 F
- y1f F
- y1l F
- yn F
- ynf F
- ynl F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 _LIB_VERSION D 0x4
+GLIBC_2.22 __acos_finite F
+GLIBC_2.22 __acosf_finite F
+GLIBC_2.22 __acosh_finite F
+GLIBC_2.22 __acoshf_finite F
+GLIBC_2.22 __asin_finite F
+GLIBC_2.22 __asinf_finite F
+GLIBC_2.22 __atan2_finite F
+GLIBC_2.22 __atan2f_finite F
+GLIBC_2.22 __atanh_finite F
+GLIBC_2.22 __atanhf_finite F
+GLIBC_2.22 __clog10 F
+GLIBC_2.22 __clog10f F
+GLIBC_2.22 __clog10l F
+GLIBC_2.22 __cosh_finite F
+GLIBC_2.22 __coshf_finite F
+GLIBC_2.22 __exp10_finite F
+GLIBC_2.22 __exp10f_finite F
+GLIBC_2.22 __exp2_finite F
+GLIBC_2.22 __exp2f_finite F
+GLIBC_2.22 __exp_finite F
+GLIBC_2.22 __expf_finite F
+GLIBC_2.22 __finite F
+GLIBC_2.22 __finitef F
+GLIBC_2.22 __finitel F
+GLIBC_2.22 __fmod_finite F
+GLIBC_2.22 __fmodf_finite F
+GLIBC_2.22 __fpclassify F
+GLIBC_2.22 __fpclassifyf F
+GLIBC_2.22 __gamma_r_finite F
+GLIBC_2.22 __gammaf_r_finite F
+GLIBC_2.22 __hypot_finite F
+GLIBC_2.22 __hypotf_finite F
+GLIBC_2.22 __issignaling F
+GLIBC_2.22 __issignalingf F
+GLIBC_2.22 __j0_finite F
+GLIBC_2.22 __j0f_finite F
+GLIBC_2.22 __j1_finite F
+GLIBC_2.22 __j1f_finite F
+GLIBC_2.22 __jn_finite F
+GLIBC_2.22 __jnf_finite F
+GLIBC_2.22 __lgamma_r_finite F
+GLIBC_2.22 __lgammaf_r_finite F
+GLIBC_2.22 __log10_finite F
+GLIBC_2.22 __log10f_finite F
+GLIBC_2.22 __log2_finite F
+GLIBC_2.22 __log2f_finite F
+GLIBC_2.22 __log_finite F
+GLIBC_2.22 __logf_finite F
+GLIBC_2.22 __pow_finite F
+GLIBC_2.22 __powf_finite F
+GLIBC_2.22 __remainder_finite F
+GLIBC_2.22 __remainderf_finite F
+GLIBC_2.22 __scalb_finite F
+GLIBC_2.22 __scalbf_finite F
+GLIBC_2.22 __signbit F
+GLIBC_2.22 __signbitf F
+GLIBC_2.22 __sinh_finite F
+GLIBC_2.22 __sinhf_finite F
+GLIBC_2.22 __sqrt_finite F
+GLIBC_2.22 __sqrtf_finite F
+GLIBC_2.22 __y0_finite F
+GLIBC_2.22 __y0f_finite F
+GLIBC_2.22 __y1_finite F
+GLIBC_2.22 __y1f_finite F
+GLIBC_2.22 __yn_finite F
+GLIBC_2.22 __ynf_finite F
+GLIBC_2.22 acos F
+GLIBC_2.22 acosf F
+GLIBC_2.22 acosh F
+GLIBC_2.22 acoshf F
+GLIBC_2.22 acoshl F
+GLIBC_2.22 acosl F
+GLIBC_2.22 asin F
+GLIBC_2.22 asinf F
+GLIBC_2.22 asinh F
+GLIBC_2.22 asinhf F
+GLIBC_2.22 asinhl F
+GLIBC_2.22 asinl F
+GLIBC_2.22 atan F
+GLIBC_2.22 atan2 F
+GLIBC_2.22 atan2f F
+GLIBC_2.22 atan2l F
+GLIBC_2.22 atanf F
+GLIBC_2.22 atanh F
+GLIBC_2.22 atanhf F
+GLIBC_2.22 atanhl F
+GLIBC_2.22 atanl F
+GLIBC_2.22 cabs F
+GLIBC_2.22 cabsf F
+GLIBC_2.22 cabsl F
+GLIBC_2.22 cacos F
+GLIBC_2.22 cacosf F
+GLIBC_2.22 cacosh F
+GLIBC_2.22 cacoshf F
+GLIBC_2.22 cacoshl F
+GLIBC_2.22 cacosl F
+GLIBC_2.22 carg F
+GLIBC_2.22 cargf F
+GLIBC_2.22 cargl F
+GLIBC_2.22 casin F
+GLIBC_2.22 casinf F
+GLIBC_2.22 casinh F
+GLIBC_2.22 casinhf F
+GLIBC_2.22 casinhl F
+GLIBC_2.22 casinl F
+GLIBC_2.22 catan F
+GLIBC_2.22 catanf F
+GLIBC_2.22 catanh F
+GLIBC_2.22 catanhf F
+GLIBC_2.22 catanhl F
+GLIBC_2.22 catanl F
+GLIBC_2.22 cbrt F
+GLIBC_2.22 cbrtf F
+GLIBC_2.22 cbrtl F
+GLIBC_2.22 ccos F
+GLIBC_2.22 ccosf F
+GLIBC_2.22 ccosh F
+GLIBC_2.22 ccoshf F
+GLIBC_2.22 ccoshl F
+GLIBC_2.22 ccosl F
+GLIBC_2.22 ceil F
+GLIBC_2.22 ceilf F
+GLIBC_2.22 ceill F
+GLIBC_2.22 cexp F
+GLIBC_2.22 cexpf F
+GLIBC_2.22 cexpl F
+GLIBC_2.22 cimag F
+GLIBC_2.22 cimagf F
+GLIBC_2.22 cimagl F
+GLIBC_2.22 clog F
+GLIBC_2.22 clog10 F
+GLIBC_2.22 clog10f F
+GLIBC_2.22 clog10l F
+GLIBC_2.22 clogf F
+GLIBC_2.22 clogl F
+GLIBC_2.22 conj F
+GLIBC_2.22 conjf F
+GLIBC_2.22 conjl F
+GLIBC_2.22 copysign F
+GLIBC_2.22 copysignf F
+GLIBC_2.22 copysignl F
+GLIBC_2.22 cos F
+GLIBC_2.22 cosf F
+GLIBC_2.22 cosh F
+GLIBC_2.22 coshf F
+GLIBC_2.22 coshl F
+GLIBC_2.22 cosl F
+GLIBC_2.22 cpow F
+GLIBC_2.22 cpowf F
+GLIBC_2.22 cpowl F
+GLIBC_2.22 cproj F
+GLIBC_2.22 cprojf F
+GLIBC_2.22 cprojl F
+GLIBC_2.22 creal F
+GLIBC_2.22 crealf F
+GLIBC_2.22 creall F
+GLIBC_2.22 csin F
+GLIBC_2.22 csinf F
+GLIBC_2.22 csinh F
+GLIBC_2.22 csinhf F
+GLIBC_2.22 csinhl F
+GLIBC_2.22 csinl F
+GLIBC_2.22 csqrt F
+GLIBC_2.22 csqrtf F
+GLIBC_2.22 csqrtl F
+GLIBC_2.22 ctan F
+GLIBC_2.22 ctanf F
+GLIBC_2.22 ctanh F
+GLIBC_2.22 ctanhf F
+GLIBC_2.22 ctanhl F
+GLIBC_2.22 ctanl F
+GLIBC_2.22 drem F
+GLIBC_2.22 dremf F
+GLIBC_2.22 dreml F
+GLIBC_2.22 erf F
+GLIBC_2.22 erfc F
+GLIBC_2.22 erfcf F
+GLIBC_2.22 erfcl F
+GLIBC_2.22 erff F
+GLIBC_2.22 erfl F
+GLIBC_2.22 exp F
+GLIBC_2.22 exp10 F
+GLIBC_2.22 exp10f F
+GLIBC_2.22 exp10l F
+GLIBC_2.22 exp2 F
+GLIBC_2.22 exp2f F
+GLIBC_2.22 exp2l F
+GLIBC_2.22 expf F
+GLIBC_2.22 expl F
+GLIBC_2.22 expm1 F
+GLIBC_2.22 expm1f F
+GLIBC_2.22 expm1l F
+GLIBC_2.22 fabs F
+GLIBC_2.22 fabsf F
+GLIBC_2.22 fabsl F
+GLIBC_2.22 fdim F
+GLIBC_2.22 fdimf F
+GLIBC_2.22 fdiml F
+GLIBC_2.22 feclearexcept F
+GLIBC_2.22 fedisableexcept F
+GLIBC_2.22 feenableexcept F
+GLIBC_2.22 fegetenv F
+GLIBC_2.22 fegetexcept F
+GLIBC_2.22 fegetexceptflag F
+GLIBC_2.22 fegetround F
+GLIBC_2.22 feholdexcept F
+GLIBC_2.22 feraiseexcept F
+GLIBC_2.22 fesetenv F
+GLIBC_2.22 fesetexceptflag F
+GLIBC_2.22 fesetround F
+GLIBC_2.22 fetestexcept F
+GLIBC_2.22 feupdateenv F
+GLIBC_2.22 finite F
+GLIBC_2.22 finitef F
+GLIBC_2.22 finitel F
+GLIBC_2.22 floor F
+GLIBC_2.22 floorf F
+GLIBC_2.22 floorl F
+GLIBC_2.22 fma F
+GLIBC_2.22 fmaf F
+GLIBC_2.22 fmal F
+GLIBC_2.22 fmax F
+GLIBC_2.22 fmaxf F
+GLIBC_2.22 fmaxl F
+GLIBC_2.22 fmin F
+GLIBC_2.22 fminf F
+GLIBC_2.22 fminl F
+GLIBC_2.22 fmod F
+GLIBC_2.22 fmodf F
+GLIBC_2.22 fmodl F
+GLIBC_2.22 frexp F
+GLIBC_2.22 frexpf F
+GLIBC_2.22 frexpl F
+GLIBC_2.22 gamma F
+GLIBC_2.22 gammaf F
+GLIBC_2.22 gammal F
+GLIBC_2.22 hypot F
+GLIBC_2.22 hypotf F
+GLIBC_2.22 hypotl F
+GLIBC_2.22 ilogb F
+GLIBC_2.22 ilogbf F
+GLIBC_2.22 ilogbl F
+GLIBC_2.22 j0 F
+GLIBC_2.22 j0f F
+GLIBC_2.22 j0l F
+GLIBC_2.22 j1 F
+GLIBC_2.22 j1f F
+GLIBC_2.22 j1l F
+GLIBC_2.22 jn F
+GLIBC_2.22 jnf F
+GLIBC_2.22 jnl F
+GLIBC_2.22 ldexp F
+GLIBC_2.22 ldexpf F
+GLIBC_2.22 ldexpl F
+GLIBC_2.22 lgamma F
+GLIBC_2.22 lgamma_r F
+GLIBC_2.22 lgammaf F
+GLIBC_2.22 lgammaf_r F
+GLIBC_2.22 lgammal F
+GLIBC_2.22 lgammal_r F
+GLIBC_2.22 llrint F
+GLIBC_2.22 llrintf F
+GLIBC_2.22 llrintl F
+GLIBC_2.22 llround F
+GLIBC_2.22 llroundf F
+GLIBC_2.22 llroundl F
+GLIBC_2.22 log F
+GLIBC_2.22 log10 F
+GLIBC_2.22 log10f F
+GLIBC_2.22 log10l F
+GLIBC_2.22 log1p F
+GLIBC_2.22 log1pf F
+GLIBC_2.22 log1pl F
+GLIBC_2.22 log2 F
+GLIBC_2.22 log2f F
+GLIBC_2.22 log2l F
+GLIBC_2.22 logb F
+GLIBC_2.22 logbf F
+GLIBC_2.22 logbl F
+GLIBC_2.22 logf F
+GLIBC_2.22 logl F
+GLIBC_2.22 lrint F
+GLIBC_2.22 lrintf F
+GLIBC_2.22 lrintl F
+GLIBC_2.22 lround F
+GLIBC_2.22 lroundf F
+GLIBC_2.22 lroundl F
+GLIBC_2.22 matherr F
+GLIBC_2.22 modf F
+GLIBC_2.22 modff F
+GLIBC_2.22 modfl F
+GLIBC_2.22 nan F
+GLIBC_2.22 nanf F
+GLIBC_2.22 nanl F
+GLIBC_2.22 nearbyint F
+GLIBC_2.22 nearbyintf F
+GLIBC_2.22 nearbyintl F
+GLIBC_2.22 nextafter F
+GLIBC_2.22 nextafterf F
+GLIBC_2.22 nextafterl F
+GLIBC_2.22 nexttoward F
+GLIBC_2.22 nexttowardf F
+GLIBC_2.22 nexttowardl F
+GLIBC_2.22 pow F
+GLIBC_2.22 pow10 F
+GLIBC_2.22 pow10f F
+GLIBC_2.22 pow10l F
+GLIBC_2.22 powf F
+GLIBC_2.22 powl F
+GLIBC_2.22 remainder F
+GLIBC_2.22 remainderf F
+GLIBC_2.22 remainderl F
+GLIBC_2.22 remquo F
+GLIBC_2.22 remquof F
+GLIBC_2.22 remquol F
+GLIBC_2.22 rint F
+GLIBC_2.22 rintf F
+GLIBC_2.22 rintl F
+GLIBC_2.22 round F
+GLIBC_2.22 roundf F
+GLIBC_2.22 roundl F
+GLIBC_2.22 scalb F
+GLIBC_2.22 scalbf F
+GLIBC_2.22 scalbl F
+GLIBC_2.22 scalbln F
+GLIBC_2.22 scalblnf F
+GLIBC_2.22 scalblnl F
+GLIBC_2.22 scalbn F
+GLIBC_2.22 scalbnf F
+GLIBC_2.22 scalbnl F
+GLIBC_2.22 signgam D 0x4
+GLIBC_2.22 significand F
+GLIBC_2.22 significandf F
+GLIBC_2.22 significandl F
+GLIBC_2.22 sin F
+GLIBC_2.22 sincos F
+GLIBC_2.22 sincosf F
+GLIBC_2.22 sincosl F
+GLIBC_2.22 sinf F
+GLIBC_2.22 sinh F
+GLIBC_2.22 sinhf F
+GLIBC_2.22 sinhl F
+GLIBC_2.22 sinl F
+GLIBC_2.22 sqrt F
+GLIBC_2.22 sqrtf F
+GLIBC_2.22 sqrtl F
+GLIBC_2.22 tan F
+GLIBC_2.22 tanf F
+GLIBC_2.22 tanh F
+GLIBC_2.22 tanhf F
+GLIBC_2.22 tanhl F
+GLIBC_2.22 tanl F
+GLIBC_2.22 tgamma F
+GLIBC_2.22 tgammaf F
+GLIBC_2.22 tgammal F
+GLIBC_2.22 trunc F
+GLIBC_2.22 truncf F
+GLIBC_2.22 truncl F
+GLIBC_2.22 y0 F
+GLIBC_2.22 y0f F
+GLIBC_2.22 y0l F
+GLIBC_2.22 y1 F
+GLIBC_2.22 y1f F
+GLIBC_2.22 y1l F
+GLIBC_2.22 yn F
+GLIBC_2.22 ynf F
+GLIBC_2.22 ynl F
diff --git a/sysdeps/nacl/libpthread.abilist b/sysdeps/nacl/libpthread.abilist
index 6c5e70da2f..8f0099cb2f 100644
--- a/sysdeps/nacl/libpthread.abilist
+++ b/sysdeps/nacl/libpthread.abilist
@@ -1,176 +1,175 @@
-GLIBC_2.22
- GLIBC_2.22 A
- _IO_flockfile F
- _IO_ftrylockfile F
- _IO_funlockfile F
- __errno_location F
- __h_errno_location F
- __libc_allocate_rtsig F
- __libc_current_sigrtmax F
- __libc_current_sigrtmin F
- __pthread_cleanup_routine F
- __pthread_getspecific F
- __pthread_key_create F
- __pthread_mutex_destroy F
- __pthread_mutex_init F
- __pthread_mutex_lock F
- __pthread_mutex_trylock F
- __pthread_mutex_unlock F
- __pthread_mutexattr_destroy F
- __pthread_mutexattr_init F
- __pthread_mutexattr_settype F
- __pthread_once F
- __pthread_register_cancel F
- __pthread_register_cancel_defer F
- __pthread_rwlock_destroy F
- __pthread_rwlock_init F
- __pthread_rwlock_rdlock F
- __pthread_rwlock_tryrdlock F
- __pthread_rwlock_trywrlock F
- __pthread_rwlock_unlock F
- __pthread_rwlock_wrlock F
- __pthread_setspecific F
- __pthread_unregister_cancel F
- __pthread_unregister_cancel_restore F
- __pthread_unwind_next F
- __res_state F
- _pthread_cleanup_pop F
- _pthread_cleanup_pop_restore F
- _pthread_cleanup_push F
- _pthread_cleanup_push_defer F
- flockfile F
- ftrylockfile F
- funlockfile F
- pthread_attr_destroy F
- pthread_attr_getaffinity_np F
- pthread_attr_getdetachstate F
- pthread_attr_getguardsize F
- pthread_attr_getinheritsched F
- pthread_attr_getschedparam F
- pthread_attr_getschedpolicy F
- pthread_attr_getscope F
- pthread_attr_getstack F
- pthread_attr_getstackaddr F
- pthread_attr_getstacksize F
- pthread_attr_init F
- pthread_attr_setaffinity_np F
- pthread_attr_setdetachstate F
- pthread_attr_setguardsize F
- pthread_attr_setinheritsched F
- pthread_attr_setschedparam F
- pthread_attr_setschedpolicy F
- pthread_attr_setscope F
- pthread_attr_setstack F
- pthread_attr_setstackaddr F
- pthread_attr_setstacksize F
- pthread_barrier_destroy F
- pthread_barrier_init F
- pthread_barrier_wait F
- pthread_barrierattr_destroy F
- pthread_barrierattr_getpshared F
- pthread_barrierattr_init F
- pthread_barrierattr_setpshared F
- pthread_cancel F
- pthread_cond_broadcast F
- pthread_cond_destroy F
- pthread_cond_init F
- pthread_cond_signal F
- pthread_cond_timedwait F
- pthread_cond_wait F
- pthread_condattr_destroy F
- pthread_condattr_getclock F
- pthread_condattr_getpshared F
- pthread_condattr_init F
- pthread_condattr_setclock F
- pthread_condattr_setpshared F
- pthread_create F
- pthread_detach F
- pthread_equal F
- pthread_exit F
- pthread_getaffinity_np F
- pthread_getattr_default_np F
- pthread_getattr_np F
- pthread_getconcurrency F
- pthread_getcpuclockid F
- pthread_getname_np F
- pthread_getschedparam F
- pthread_getspecific F
- pthread_join F
- pthread_key_create F
- pthread_key_delete F
- pthread_kill F
- pthread_kill_other_threads_np F
- pthread_mutex_consistent F
- pthread_mutex_consistent_np F
- pthread_mutex_destroy F
- pthread_mutex_getprioceiling F
- pthread_mutex_init F
- pthread_mutex_lock F
- pthread_mutex_setprioceiling F
- pthread_mutex_timedlock F
- pthread_mutex_trylock F
- pthread_mutex_unlock F
- pthread_mutexattr_destroy F
- pthread_mutexattr_getkind_np F
- pthread_mutexattr_getprioceiling F
- pthread_mutexattr_getprotocol F
- pthread_mutexattr_getpshared F
- pthread_mutexattr_getrobust F
- pthread_mutexattr_getrobust_np F
- pthread_mutexattr_gettype F
- pthread_mutexattr_init F
- pthread_mutexattr_setkind_np F
- pthread_mutexattr_setprioceiling F
- pthread_mutexattr_setprotocol F
- pthread_mutexattr_setpshared F
- pthread_mutexattr_setrobust F
- pthread_mutexattr_setrobust_np F
- pthread_mutexattr_settype F
- pthread_once F
- pthread_rwlock_destroy F
- pthread_rwlock_init F
- pthread_rwlock_rdlock F
- pthread_rwlock_timedrdlock F
- pthread_rwlock_timedwrlock F
- pthread_rwlock_tryrdlock F
- pthread_rwlock_trywrlock F
- pthread_rwlock_unlock F
- pthread_rwlock_wrlock F
- pthread_rwlockattr_destroy F
- pthread_rwlockattr_getkind_np F
- pthread_rwlockattr_getpshared F
- pthread_rwlockattr_init F
- pthread_rwlockattr_setkind_np F
- pthread_rwlockattr_setpshared F
- pthread_self F
- pthread_setaffinity_np F
- pthread_setattr_default_np F
- pthread_setcancelstate F
- pthread_setcanceltype F
- pthread_setconcurrency F
- pthread_setname_np F
- pthread_setschedparam F
- pthread_setschedprio F
- pthread_setspecific F
- pthread_sigmask F
- pthread_sigqueue F
- pthread_spin_destroy F
- pthread_spin_init F
- pthread_spin_lock F
- pthread_spin_trylock F
- pthread_spin_unlock F
- pthread_testcancel F
- pthread_timedjoin_np F
- pthread_tryjoin_np F
- pthread_yield F
- raise F
- sem_close F
- sem_destroy F
- sem_getvalue F
- sem_init F
- sem_open F
- sem_post F
- sem_timedwait F
- sem_trywait F
- sem_unlink F
- sem_wait F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 _IO_flockfile F
+GLIBC_2.22 _IO_ftrylockfile F
+GLIBC_2.22 _IO_funlockfile F
+GLIBC_2.22 __errno_location F
+GLIBC_2.22 __h_errno_location F
+GLIBC_2.22 __libc_allocate_rtsig F
+GLIBC_2.22 __libc_current_sigrtmax F
+GLIBC_2.22 __libc_current_sigrtmin F
+GLIBC_2.22 __pthread_cleanup_routine F
+GLIBC_2.22 __pthread_getspecific F
+GLIBC_2.22 __pthread_key_create F
+GLIBC_2.22 __pthread_mutex_destroy F
+GLIBC_2.22 __pthread_mutex_init F
+GLIBC_2.22 __pthread_mutex_lock F
+GLIBC_2.22 __pthread_mutex_trylock F
+GLIBC_2.22 __pthread_mutex_unlock F
+GLIBC_2.22 __pthread_mutexattr_destroy F
+GLIBC_2.22 __pthread_mutexattr_init F
+GLIBC_2.22 __pthread_mutexattr_settype F
+GLIBC_2.22 __pthread_once F
+GLIBC_2.22 __pthread_register_cancel F
+GLIBC_2.22 __pthread_register_cancel_defer F
+GLIBC_2.22 __pthread_rwlock_destroy F
+GLIBC_2.22 __pthread_rwlock_init F
+GLIBC_2.22 __pthread_rwlock_rdlock F
+GLIBC_2.22 __pthread_rwlock_tryrdlock F
+GLIBC_2.22 __pthread_rwlock_trywrlock F
+GLIBC_2.22 __pthread_rwlock_unlock F
+GLIBC_2.22 __pthread_rwlock_wrlock F
+GLIBC_2.22 __pthread_setspecific F
+GLIBC_2.22 __pthread_unregister_cancel F
+GLIBC_2.22 __pthread_unregister_cancel_restore F
+GLIBC_2.22 __pthread_unwind_next F
+GLIBC_2.22 __res_state F
+GLIBC_2.22 _pthread_cleanup_pop F
+GLIBC_2.22 _pthread_cleanup_pop_restore F
+GLIBC_2.22 _pthread_cleanup_push F
+GLIBC_2.22 _pthread_cleanup_push_defer F
+GLIBC_2.22 flockfile F
+GLIBC_2.22 ftrylockfile F
+GLIBC_2.22 funlockfile F
+GLIBC_2.22 pthread_attr_destroy F
+GLIBC_2.22 pthread_attr_getaffinity_np F
+GLIBC_2.22 pthread_attr_getdetachstate F
+GLIBC_2.22 pthread_attr_getguardsize F
+GLIBC_2.22 pthread_attr_getinheritsched F
+GLIBC_2.22 pthread_attr_getschedparam F
+GLIBC_2.22 pthread_attr_getschedpolicy F
+GLIBC_2.22 pthread_attr_getscope F
+GLIBC_2.22 pthread_attr_getstack F
+GLIBC_2.22 pthread_attr_getstackaddr F
+GLIBC_2.22 pthread_attr_getstacksize F
+GLIBC_2.22 pthread_attr_init F
+GLIBC_2.22 pthread_attr_setaffinity_np F
+GLIBC_2.22 pthread_attr_setdetachstate F
+GLIBC_2.22 pthread_attr_setguardsize F
+GLIBC_2.22 pthread_attr_setinheritsched F
+GLIBC_2.22 pthread_attr_setschedparam F
+GLIBC_2.22 pthread_attr_setschedpolicy F
+GLIBC_2.22 pthread_attr_setscope F
+GLIBC_2.22 pthread_attr_setstack F
+GLIBC_2.22 pthread_attr_setstackaddr F
+GLIBC_2.22 pthread_attr_setstacksize F
+GLIBC_2.22 pthread_barrier_destroy F
+GLIBC_2.22 pthread_barrier_init F
+GLIBC_2.22 pthread_barrier_wait F
+GLIBC_2.22 pthread_barrierattr_destroy F
+GLIBC_2.22 pthread_barrierattr_getpshared F
+GLIBC_2.22 pthread_barrierattr_init F
+GLIBC_2.22 pthread_barrierattr_setpshared F
+GLIBC_2.22 pthread_cancel F
+GLIBC_2.22 pthread_cond_broadcast F
+GLIBC_2.22 pthread_cond_destroy F
+GLIBC_2.22 pthread_cond_init F
+GLIBC_2.22 pthread_cond_signal F
+GLIBC_2.22 pthread_cond_timedwait F
+GLIBC_2.22 pthread_cond_wait F
+GLIBC_2.22 pthread_condattr_destroy F
+GLIBC_2.22 pthread_condattr_getclock F
+GLIBC_2.22 pthread_condattr_getpshared F
+GLIBC_2.22 pthread_condattr_init F
+GLIBC_2.22 pthread_condattr_setclock F
+GLIBC_2.22 pthread_condattr_setpshared F
+GLIBC_2.22 pthread_create F
+GLIBC_2.22 pthread_detach F
+GLIBC_2.22 pthread_equal F
+GLIBC_2.22 pthread_exit F
+GLIBC_2.22 pthread_getaffinity_np F
+GLIBC_2.22 pthread_getattr_default_np F
+GLIBC_2.22 pthread_getattr_np F
+GLIBC_2.22 pthread_getconcurrency F
+GLIBC_2.22 pthread_getcpuclockid F
+GLIBC_2.22 pthread_getname_np F
+GLIBC_2.22 pthread_getschedparam F
+GLIBC_2.22 pthread_getspecific F
+GLIBC_2.22 pthread_join F
+GLIBC_2.22 pthread_key_create F
+GLIBC_2.22 pthread_key_delete F
+GLIBC_2.22 pthread_kill F
+GLIBC_2.22 pthread_kill_other_threads_np F
+GLIBC_2.22 pthread_mutex_consistent F
+GLIBC_2.22 pthread_mutex_consistent_np F
+GLIBC_2.22 pthread_mutex_destroy F
+GLIBC_2.22 pthread_mutex_getprioceiling F
+GLIBC_2.22 pthread_mutex_init F
+GLIBC_2.22 pthread_mutex_lock F
+GLIBC_2.22 pthread_mutex_setprioceiling F
+GLIBC_2.22 pthread_mutex_timedlock F
+GLIBC_2.22 pthread_mutex_trylock F
+GLIBC_2.22 pthread_mutex_unlock F
+GLIBC_2.22 pthread_mutexattr_destroy F
+GLIBC_2.22 pthread_mutexattr_getkind_np F
+GLIBC_2.22 pthread_mutexattr_getprioceiling F
+GLIBC_2.22 pthread_mutexattr_getprotocol F
+GLIBC_2.22 pthread_mutexattr_getpshared F
+GLIBC_2.22 pthread_mutexattr_getrobust F
+GLIBC_2.22 pthread_mutexattr_getrobust_np F
+GLIBC_2.22 pthread_mutexattr_gettype F
+GLIBC_2.22 pthread_mutexattr_init F
+GLIBC_2.22 pthread_mutexattr_setkind_np F
+GLIBC_2.22 pthread_mutexattr_setprioceiling F
+GLIBC_2.22 pthread_mutexattr_setprotocol F
+GLIBC_2.22 pthread_mutexattr_setpshared F
+GLIBC_2.22 pthread_mutexattr_setrobust F
+GLIBC_2.22 pthread_mutexattr_setrobust_np F
+GLIBC_2.22 pthread_mutexattr_settype F
+GLIBC_2.22 pthread_once F
+GLIBC_2.22 pthread_rwlock_destroy F
+GLIBC_2.22 pthread_rwlock_init F
+GLIBC_2.22 pthread_rwlock_rdlock F
+GLIBC_2.22 pthread_rwlock_timedrdlock F
+GLIBC_2.22 pthread_rwlock_timedwrlock F
+GLIBC_2.22 pthread_rwlock_tryrdlock F
+GLIBC_2.22 pthread_rwlock_trywrlock F
+GLIBC_2.22 pthread_rwlock_unlock F
+GLIBC_2.22 pthread_rwlock_wrlock F
+GLIBC_2.22 pthread_rwlockattr_destroy F
+GLIBC_2.22 pthread_rwlockattr_getkind_np F
+GLIBC_2.22 pthread_rwlockattr_getpshared F
+GLIBC_2.22 pthread_rwlockattr_init F
+GLIBC_2.22 pthread_rwlockattr_setkind_np F
+GLIBC_2.22 pthread_rwlockattr_setpshared F
+GLIBC_2.22 pthread_self F
+GLIBC_2.22 pthread_setaffinity_np F
+GLIBC_2.22 pthread_setattr_default_np F
+GLIBC_2.22 pthread_setcancelstate F
+GLIBC_2.22 pthread_setcanceltype F
+GLIBC_2.22 pthread_setconcurrency F
+GLIBC_2.22 pthread_setname_np F
+GLIBC_2.22 pthread_setschedparam F
+GLIBC_2.22 pthread_setschedprio F
+GLIBC_2.22 pthread_setspecific F
+GLIBC_2.22 pthread_sigmask F
+GLIBC_2.22 pthread_sigqueue F
+GLIBC_2.22 pthread_spin_destroy F
+GLIBC_2.22 pthread_spin_init F
+GLIBC_2.22 pthread_spin_lock F
+GLIBC_2.22 pthread_spin_trylock F
+GLIBC_2.22 pthread_spin_unlock F
+GLIBC_2.22 pthread_testcancel F
+GLIBC_2.22 pthread_timedjoin_np F
+GLIBC_2.22 pthread_tryjoin_np F
+GLIBC_2.22 pthread_yield F
+GLIBC_2.22 raise F
+GLIBC_2.22 sem_close F
+GLIBC_2.22 sem_destroy F
+GLIBC_2.22 sem_getvalue F
+GLIBC_2.22 sem_init F
+GLIBC_2.22 sem_open F
+GLIBC_2.22 sem_post F
+GLIBC_2.22 sem_timedwait F
+GLIBC_2.22 sem_trywait F
+GLIBC_2.22 sem_unlink F
+GLIBC_2.22 sem_wait F
diff --git a/sysdeps/nacl/libresolv.abilist b/sysdeps/nacl/libresolv.abilist
index 379b4c11af..03f6bc211a 100644
--- a/sysdeps/nacl/libresolv.abilist
+++ b/sysdeps/nacl/libresolv.abilist
@@ -1,93 +1,92 @@
-GLIBC_2.22
- GLIBC_2.22 A
- __b64_ntop F
- __b64_pton F
- __dn_comp F
- __dn_count_labels F
- __dn_expand F
- __dn_skipname F
- __fp_nquery F
- __fp_query F
- __fp_resstat F
- __hostalias F
- __loc_aton F
- __loc_ntoa F
- __p_cdname F
- __p_cdnname F
- __p_class F
- __p_class_syms D 0x54
- __p_fqname F
- __p_fqnname F
- __p_option F
- __p_query F
- __p_rcode F
- __p_secstodate F
- __p_time F
- __p_type F
- __p_type_syms D 0x228
- __putlong F
- __putshort F
- __res_close F
- __res_dnok F
- __res_hnok F
- __res_hostalias F
- __res_isourserver F
- __res_mailok F
- __res_mkquery F
- __res_nameinquery F
- __res_nmkquery F
- __res_nquery F
- __res_nquerydomain F
- __res_nsearch F
- __res_nsend F
- __res_ownok F
- __res_queriesmatch F
- __res_query F
- __res_querydomain F
- __res_search F
- __res_send F
- __sym_ntop F
- __sym_ntos F
- __sym_ston F
- _gethtbyaddr F
- _gethtbyname F
- _gethtbyname2 F
- _gethtent F
- _getlong F
- _getshort F
- _res_opcodes D 0x40
- _sethtent F
- inet_net_ntop F
- inet_net_pton F
- inet_neta F
- ns_datetosecs F
- ns_format_ttl F
- ns_get16 F
- ns_get32 F
- ns_initparse F
- ns_makecanon F
- ns_msg_getflag F
- ns_name_compress F
- ns_name_ntol F
- ns_name_ntop F
- ns_name_pack F
- ns_name_pton F
- ns_name_rollback F
- ns_name_skip F
- ns_name_uncompress F
- ns_name_unpack F
- ns_parse_ttl F
- ns_parserr F
- ns_put16 F
- ns_put32 F
- ns_samedomain F
- ns_samename F
- ns_skiprr F
- ns_sprintrr F
- ns_sprintrrf F
- ns_subdomain F
- res_gethostbyaddr F
- res_gethostbyname F
- res_gethostbyname2 F
- res_send_setqhook F
- res_send_setrhook F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 __b64_ntop F
+GLIBC_2.22 __b64_pton F
+GLIBC_2.22 __dn_comp F
+GLIBC_2.22 __dn_count_labels F
+GLIBC_2.22 __dn_expand F
+GLIBC_2.22 __dn_skipname F
+GLIBC_2.22 __fp_nquery F
+GLIBC_2.22 __fp_query F
+GLIBC_2.22 __fp_resstat F
+GLIBC_2.22 __hostalias F
+GLIBC_2.22 __loc_aton F
+GLIBC_2.22 __loc_ntoa F
+GLIBC_2.22 __p_cdname F
+GLIBC_2.22 __p_cdnname F
+GLIBC_2.22 __p_class F
+GLIBC_2.22 __p_class_syms D 0x54
+GLIBC_2.22 __p_fqname F
+GLIBC_2.22 __p_fqnname F
+GLIBC_2.22 __p_option F
+GLIBC_2.22 __p_query F
+GLIBC_2.22 __p_rcode F
+GLIBC_2.22 __p_secstodate F
+GLIBC_2.22 __p_time F
+GLIBC_2.22 __p_type F
+GLIBC_2.22 __p_type_syms D 0x228
+GLIBC_2.22 __putlong F
+GLIBC_2.22 __putshort F
+GLIBC_2.22 __res_close F
+GLIBC_2.22 __res_dnok F
+GLIBC_2.22 __res_hnok F
+GLIBC_2.22 __res_hostalias F
+GLIBC_2.22 __res_isourserver F
+GLIBC_2.22 __res_mailok F
+GLIBC_2.22 __res_mkquery F
+GLIBC_2.22 __res_nameinquery F
+GLIBC_2.22 __res_nmkquery F
+GLIBC_2.22 __res_nquery F
+GLIBC_2.22 __res_nquerydomain F
+GLIBC_2.22 __res_nsearch F
+GLIBC_2.22 __res_nsend F
+GLIBC_2.22 __res_ownok F
+GLIBC_2.22 __res_queriesmatch F
+GLIBC_2.22 __res_query F
+GLIBC_2.22 __res_querydomain F
+GLIBC_2.22 __res_search F
+GLIBC_2.22 __res_send F
+GLIBC_2.22 __sym_ntop F
+GLIBC_2.22 __sym_ntos F
+GLIBC_2.22 __sym_ston F
+GLIBC_2.22 _gethtbyaddr F
+GLIBC_2.22 _gethtbyname F
+GLIBC_2.22 _gethtbyname2 F
+GLIBC_2.22 _gethtent F
+GLIBC_2.22 _getlong F
+GLIBC_2.22 _getshort F
+GLIBC_2.22 _res_opcodes D 0x40
+GLIBC_2.22 _sethtent F
+GLIBC_2.22 inet_net_ntop F
+GLIBC_2.22 inet_net_pton F
+GLIBC_2.22 inet_neta F
+GLIBC_2.22 ns_datetosecs F
+GLIBC_2.22 ns_format_ttl F
+GLIBC_2.22 ns_get16 F
+GLIBC_2.22 ns_get32 F
+GLIBC_2.22 ns_initparse F
+GLIBC_2.22 ns_makecanon F
+GLIBC_2.22 ns_msg_getflag F
+GLIBC_2.22 ns_name_compress F
+GLIBC_2.22 ns_name_ntol F
+GLIBC_2.22 ns_name_ntop F
+GLIBC_2.22 ns_name_pack F
+GLIBC_2.22 ns_name_pton F
+GLIBC_2.22 ns_name_rollback F
+GLIBC_2.22 ns_name_skip F
+GLIBC_2.22 ns_name_uncompress F
+GLIBC_2.22 ns_name_unpack F
+GLIBC_2.22 ns_parse_ttl F
+GLIBC_2.22 ns_parserr F
+GLIBC_2.22 ns_put16 F
+GLIBC_2.22 ns_put32 F
+GLIBC_2.22 ns_samedomain F
+GLIBC_2.22 ns_samename F
+GLIBC_2.22 ns_skiprr F
+GLIBC_2.22 ns_sprintrr F
+GLIBC_2.22 ns_sprintrrf F
+GLIBC_2.22 ns_subdomain F
+GLIBC_2.22 res_gethostbyaddr F
+GLIBC_2.22 res_gethostbyname F
+GLIBC_2.22 res_gethostbyname2 F
+GLIBC_2.22 res_send_setqhook F
+GLIBC_2.22 res_send_setrhook F
diff --git a/sysdeps/nacl/librt.abilist b/sysdeps/nacl/librt.abilist
index 575b04a5c6..58a05aad05 100644
--- a/sysdeps/nacl/librt.abilist
+++ b/sysdeps/nacl/librt.abilist
@@ -1,37 +1,36 @@
-GLIBC_2.22
- GLIBC_2.22 A
- __mq_open_2 F
- aio_cancel F
- aio_cancel64 F
- aio_error F
- aio_error64 F
- aio_fsync F
- aio_fsync64 F
- aio_init F
- aio_read F
- aio_read64 F
- aio_return F
- aio_return64 F
- aio_suspend F
- aio_suspend64 F
- aio_write F
- aio_write64 F
- lio_listio F
- lio_listio64 F
- mq_close F
- mq_getattr F
- mq_notify F
- mq_open F
- mq_receive F
- mq_send F
- mq_setattr F
- mq_timedreceive F
- mq_timedsend F
- mq_unlink F
- shm_open F
- shm_unlink F
- timer_create F
- timer_delete F
- timer_getoverrun F
- timer_gettime F
- timer_settime F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 __mq_open_2 F
+GLIBC_2.22 aio_cancel F
+GLIBC_2.22 aio_cancel64 F
+GLIBC_2.22 aio_error F
+GLIBC_2.22 aio_error64 F
+GLIBC_2.22 aio_fsync F
+GLIBC_2.22 aio_fsync64 F
+GLIBC_2.22 aio_init F
+GLIBC_2.22 aio_read F
+GLIBC_2.22 aio_read64 F
+GLIBC_2.22 aio_return F
+GLIBC_2.22 aio_return64 F
+GLIBC_2.22 aio_suspend F
+GLIBC_2.22 aio_suspend64 F
+GLIBC_2.22 aio_write F
+GLIBC_2.22 aio_write64 F
+GLIBC_2.22 lio_listio F
+GLIBC_2.22 lio_listio64 F
+GLIBC_2.22 mq_close F
+GLIBC_2.22 mq_getattr F
+GLIBC_2.22 mq_notify F
+GLIBC_2.22 mq_open F
+GLIBC_2.22 mq_receive F
+GLIBC_2.22 mq_send F
+GLIBC_2.22 mq_setattr F
+GLIBC_2.22 mq_timedreceive F
+GLIBC_2.22 mq_timedsend F
+GLIBC_2.22 mq_unlink F
+GLIBC_2.22 shm_open F
+GLIBC_2.22 shm_unlink F
+GLIBC_2.22 timer_create F
+GLIBC_2.22 timer_delete F
+GLIBC_2.22 timer_getoverrun F
+GLIBC_2.22 timer_gettime F
+GLIBC_2.22 timer_settime F
diff --git a/sysdeps/nacl/libutil.abilist b/sysdeps/nacl/libutil.abilist
index 13bc9270cb..080dd1e57b 100644
--- a/sysdeps/nacl/libutil.abilist
+++ b/sysdeps/nacl/libutil.abilist
@@ -1,8 +1,7 @@
-GLIBC_2.22
- GLIBC_2.22 A
- forkpty F
- login F
- login_tty F
- logout F
- logwtmp F
- openpty F
+GLIBC_2.22 GLIBC_2.22 A
+GLIBC_2.22 forkpty F
+GLIBC_2.22 login F
+GLIBC_2.22 login_tty F
+GLIBC_2.22 logout F
+GLIBC_2.22 logwtmp F
+GLIBC_2.22 openpty F