Adjust the size value on _nl_default_dirname to match the directory name that we...

diff --git a/README.google b/README.google
index dc756230692189b88a69834ba8d8cb9d9d5b1471..2590738ba3e33c72dd943d7229d45a8211310fc1 100644 (file)
--- a/README.google
+++ b/README.google
@@ -216,3 +216,15 @@ sysdeps/generic/ldsodefs.h
   Forward-ported from cl/56574617.
   (ppluzhnikov, google-local)
 
+sysdeps/unix/sysv/linux/i386/nptl/libc.abilist
+sysdeps/unix/sysv/linux/i386/nptl/libnsl.abilist
+sysdeps/unix/sysv/linux/x86_64/64/nptl/libc.abilist
+sysdeps/unix/sysv/linux/x86_64/64/nptl/libnsl.abilist
+  Adjust the size value on _nl_default_dirname to match the directory
+  name that we use in GRTE builds so that "make check-abi" will pass, as
+  described in the glibc wiki:
+  http://sourceware.org/glibc/wiki/Testing/Testsuite#Known_testsuite_failures
+  Also adjust list of exported symbols for google-nsl-stub.
+  Similar to cr/51166205
+  (ppluzhnikov, google-local)
+

diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist b/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist
index 3cb314ddfc8e0372816434d0e1731432be489b46..4858d6f71ae9189d5c07ed6a30ef9bf9603a987e 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist
@@ -258,7 +258,7 @@ GLIBC_2.0
  _longjmp F
  _mcleanup F
  _mcount F
- _nl_default_dirname D 0x12
+ _nl_default_dirname D 0x26
  _nl_domain_bindings D 0x4
  _nl_msg_cat_cntr D 0x4
  _null_auth D 0xc

diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/i386/nptl/libnsl.abilist
index 4241e2d8871f04db4f15fc7f20b58989fb5b3477..77b207f72432d1668ee2d83c4c0e039a2ffdb0a5 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/nptl/libnsl.abilist
+++ b/sysdeps/unix/sysv/linux/i386/nptl/libnsl.abilist
@@ -1,127 +1,9 @@
 GLIBC_2.0
  GLIBC_2.0 A
- __yp_check F
- xdr_domainname F
- xdr_keydat F
- xdr_mapname F
- xdr_peername F
- xdr_valdat F
- xdr_yp_buf F
- xdr_ypbind_binding F
- xdr_ypbind_resp F
- xdr_ypbind_resptype F
- xdr_ypbind_setdom F
- xdr_ypdelete_args F
- xdr_ypmap_parms F
- xdr_ypmaplist F
- xdr_yppush_status F
- xdr_yppushresp_xfr F
- xdr_ypreq_key F
- xdr_ypreq_nokey F
- xdr_ypreq_xfr F
- xdr_ypresp_all F
- xdr_ypresp_key_val F
- xdr_ypresp_maplist F
- xdr_ypresp_master F
- xdr_ypresp_order F
- xdr_ypresp_val F
- xdr_ypresp_xfr F
- xdr_ypstat F
- xdr_ypupdate_args F
- xdr_ypxfrstat F
- yp_all F
- yp_bind F
- yp_first F
  yp_get_default_domain F
- yp_maplist F
- yp_master F
  yp_match F
- yp_next F
- yp_order F
- yp_unbind F
- yp_update F
- ypbinderr_string F
  yperr_string F
- ypprot_err F
 GLIBC_2.1
  GLIBC_2.1 A
- __free_fdresult F
- __nis_default_access F
- __nis_default_group F
- __nis_default_owner F
- __nis_default_ttl F
- __nis_finddirectory F
- __nis_hash F
- __nisbind_connect F
- __nisbind_create F
- __nisbind_destroy F
- __nisbind_next F
- nis_add F
- nis_add_entry F
- nis_addmember F
- nis_checkpoint F
- nis_clone_directory F
- nis_clone_object F
- nis_clone_result F
- nis_creategroup F
- nis_destroy_object F
- nis_destroygroup F
- nis_dir_cmp F
- nis_domain_of F
- nis_domain_of_r F
- nis_first_entry F
- nis_free_directory F
- nis_free_object F
- nis_free_request F
- nis_freenames F
- nis_freeresult F
- nis_freeservlist F
- nis_freetags F
- nis_getnames F
- nis_getservlist F
- nis_ismember F
- nis_leaf_of F
- nis_leaf_of_r F
- nis_lerror F
- nis_list F
- nis_local_directory F
- nis_local_group F
- nis_local_host F
- nis_local_principal F
- nis_lookup F
- nis_mkdir F
- nis_modify F
- nis_modify_entry F
- nis_name_of F
- nis_name_of_r F
- nis_next_entry F
- nis_perror F
- nis_ping F
- nis_print_directory F
- nis_print_entry F
- nis_print_group F
- nis_print_group_entry F
- nis_print_link F
- nis_print_object F
- nis_print_result F
- nis_print_rights F
- nis_print_table F
- nis_read_obj F
- nis_remove F
- nis_remove_entry F
- nis_removemember F
- nis_rmdir F
- nis_servstate F
- nis_sperrno F
- nis_sperror F
- nis_sperror_r F
- nis_stats F
- nis_verifygroup F
- nis_write_obj F
- readColdStartFile F
- writeColdStartFile F
- xdr_cback_data F
- xdr_obj_p F
 GLIBC_2.2
  GLIBC_2.2 A
- xdr_ypall F

diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/nptl/libc.abilist
index 914b5908f0fb415a04c87f0aaeecaa02a08e5d02..b3829065bbf9f0e5cc6d5417bea0010c91d8c463 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/nptl/libc.abilist
@@ -516,7 +516,7 @@ GLIBC_2.2.5
  _longjmp F
  _mcleanup F
  _mcount F
- _nl_default_dirname D 0x12
+ _nl_default_dirname D 0x26
  _nl_domain_bindings D 0x8
  _nl_msg_cat_cntr D 0x4
  _null_auth D 0x18

diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/x86_64/64/nptl/libnsl.abilist
index a6aa9125b8b979ac67f3b57691313ef3ea774ff0..401ee0c1442176309ee9168f924d2a455710d9e3 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libnsl.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/nptl/libnsl.abilist
@@ -1,123 +1,5 @@
 GLIBC_2.2.5
  GLIBC_2.2.5 A
- __free_fdresult F
- __nis_default_access F
- __nis_default_group F
- __nis_default_owner F
- __nis_default_ttl F
- __nis_finddirectory F
- __nis_hash F
- __nisbind_connect F
- __nisbind_create F
- __nisbind_destroy F
- __nisbind_next F
- __yp_check F
- nis_add F
- nis_add_entry F
- nis_addmember F
- nis_checkpoint F
- nis_clone_directory F
- nis_clone_object F
- nis_clone_result F
- nis_creategroup F
- nis_destroy_object F
- nis_destroygroup F
- nis_dir_cmp F
- nis_domain_of F
- nis_domain_of_r F
- nis_first_entry F
- nis_free_directory F
- nis_free_object F
- nis_free_request F
- nis_freenames F
- nis_freeresult F
- nis_freeservlist F
- nis_freetags F
- nis_getnames F
- nis_getservlist F
- nis_ismember F
- nis_leaf_of F
- nis_leaf_of_r F
- nis_lerror F
- nis_list F
- nis_local_directory F
- nis_local_group F
- nis_local_host F
- nis_local_principal F
- nis_lookup F
- nis_mkdir F
- nis_modify F
- nis_modify_entry F
- nis_name_of F
- nis_name_of_r F
- nis_next_entry F
- nis_perror F
- nis_ping F
- nis_print_directory F
- nis_print_entry F
- nis_print_group F
- nis_print_group_entry F
- nis_print_link F
- nis_print_object F
- nis_print_result F
- nis_print_rights F
- nis_print_table F
- nis_read_obj F
- nis_remove F
- nis_remove_entry F
- nis_removemember F
- nis_rmdir F
- nis_servstate F
- nis_sperrno F
- nis_sperror F
- nis_sperror_r F
- nis_stats F
- nis_verifygroup F
- nis_write_obj F
- readColdStartFile F
- writeColdStartFile F
- xdr_cback_data F
- xdr_domainname F
- xdr_keydat F
- xdr_mapname F
- xdr_obj_p F
- xdr_peername F
- xdr_valdat F
- xdr_yp_buf F
- xdr_ypall F
- xdr_ypbind_binding F
- xdr_ypbind_resp F
- xdr_ypbind_resptype F
- xdr_ypbind_setdom F
- xdr_ypdelete_args F
- xdr_ypmap_parms F
- xdr_ypmaplist F
- xdr_yppush_status F
- xdr_yppushresp_xfr F
- xdr_ypreq_key F
- xdr_ypreq_nokey F
- xdr_ypreq_xfr F
- xdr_ypresp_all F
- xdr_ypresp_key_val F
- xdr_ypresp_maplist F
- xdr_ypresp_master F
- xdr_ypresp_order F
- xdr_ypresp_val F
- xdr_ypresp_xfr F
- xdr_ypstat F
- xdr_ypupdate_args F
- xdr_ypxfrstat F
- yp_all F
- yp_bind F
- yp_first F
  yp_get_default_domain F
- yp_maplist F
- yp_master F
  yp_match F
- yp_next F
- yp_order F
- yp_unbind F
- yp_update F
- ypbinderr_string F
  yperr_string F
- ypprot_err F