From 21a497cc58df2b9b02dc687b97f105335e7a1c50 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Move res_mkquery, res_nmkquery into libc This switches to public symbols without __ prefixes, due to improved namespace management in glibc. The symbols res_mkquery, __res_mkquery, __res_nmkquery were moved with the script (using --no-new-version). res_mkquery@@GLIBC_2.34, res_nmkquery@@GLIBC_2.34 were added using make update-all-abi. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist | 5 +++++ sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist | 3 --- sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist | 5 +++++ sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist | 3 --- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'sysdeps/unix/sysv/linux/sparc') diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index c9bd20080b..d44b9bcdc4 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -982,6 +982,7 @@ GLIBC_2.0 remove F GLIBC_2.0 remque F GLIBC_2.0 rename F GLIBC_2.0 res_init F +GLIBC_2.0 res_mkquery F GLIBC_2.0 revoke F GLIBC_2.0 rewind F GLIBC_2.0 rewinddir F @@ -1939,8 +1940,10 @@ GLIBC_2.2 __pthread_rwlock_unlock F GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F GLIBC_2.2 __res_init F +GLIBC_2.2 __res_mkquery F GLIBC_2.2 __res_nclose F GLIBC_2.2 __res_ninit F +GLIBC_2.2 __res_nmkquery F GLIBC_2.2 __res_nsend F GLIBC_2.2 __res_state F GLIBC_2.2 __setmntent F @@ -2687,6 +2690,8 @@ GLIBC_2.34 pthread_tryjoin_np F GLIBC_2.34 res_dnok F GLIBC_2.34 res_hnok F GLIBC_2.34 res_mailok F +GLIBC_2.34 res_mkquery F +GLIBC_2.34 res_nmkquery F GLIBC_2.34 res_nsend F GLIBC_2.34 res_ownok F GLIBC_2.34 res_send F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist index 87c1434919..f2707204ed 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libresolv.abilist @@ -42,15 +42,12 @@ GLIBC_2.0 inet_neta F GLIBC_2.0 res_gethostbyaddr F GLIBC_2.0 res_gethostbyname F GLIBC_2.0 res_gethostbyname2 F -GLIBC_2.0 res_mkquery F GLIBC_2.0 res_query F GLIBC_2.0 res_querydomain F GLIBC_2.0 res_search F GLIBC_2.0 res_send_setqhook F GLIBC_2.0 res_send_setrhook F GLIBC_2.2 __res_hostalias F -GLIBC_2.2 __res_mkquery F -GLIBC_2.2 __res_nmkquery F GLIBC_2.2 __res_nquery F GLIBC_2.2 __res_nquerydomain F GLIBC_2.2 __res_nsearch F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index e336393be4..6bae0324ce 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -21,6 +21,7 @@ GLIBC_2.0 login_tty F GLIBC_2.0 logout F GLIBC_2.0 logwtmp F GLIBC_2.0 openpty F +GLIBC_2.0 res_mkquery F GLIBC_2.1 aio_cancel F GLIBC_2.1 aio_cancel64 F GLIBC_2.1 aio_error F @@ -472,8 +473,10 @@ GLIBC_2.2 __register_frame_info F GLIBC_2.2 __register_frame_info_table F GLIBC_2.2 __register_frame_table F GLIBC_2.2 __res_init F +GLIBC_2.2 __res_mkquery F GLIBC_2.2 __res_nclose F GLIBC_2.2 __res_ninit F +GLIBC_2.2 __res_nmkquery F GLIBC_2.2 __res_nsend F GLIBC_2.2 __res_randomid F GLIBC_2.2 __res_state F @@ -2522,6 +2525,8 @@ GLIBC_2.34 pthread_tryjoin_np F GLIBC_2.34 res_dnok F GLIBC_2.34 res_hnok F GLIBC_2.34 res_mailok F +GLIBC_2.34 res_mkquery F +GLIBC_2.34 res_nmkquery F GLIBC_2.34 res_nsend F GLIBC_2.34 res_ownok F GLIBC_2.34 res_send F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist index 9e3b8f8c31..4f5160f474 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libresolv.abilist @@ -42,15 +42,12 @@ GLIBC_2.0 inet_neta F GLIBC_2.0 res_gethostbyaddr F GLIBC_2.0 res_gethostbyname F GLIBC_2.0 res_gethostbyname2 F -GLIBC_2.0 res_mkquery F GLIBC_2.0 res_query F GLIBC_2.0 res_querydomain F GLIBC_2.0 res_search F GLIBC_2.0 res_send_setqhook F GLIBC_2.0 res_send_setrhook F GLIBC_2.2 __res_hostalias F -GLIBC_2.2 __res_mkquery F -GLIBC_2.2 __res_nmkquery F GLIBC_2.2 __res_nquery F GLIBC_2.2 __res_nquerydomain F GLIBC_2.2 __res_nsearch F -- cgit v1.2.3-70-g09d2