diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-07-09 20:09:14 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-07-09 20:09:14 +0200 |
| commit | 7c241325d67af9e24ff03d4c6f6280c17ea181f8 (patch) | |
| tree | 5667f94ae80c6e75dc1bac29ab4c51d48cfad084 /sunrpc | |
| parent | dc76a059fded7a203c82dbb91d4fc1f43d3250db (diff) | |
| download | glibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.tar.gz glibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.tar.xz glibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.zip | |
Force building with -fno-common
As a result, is not necessary to specify __attribute__ ((nocommon)) on individual definitions. GCC 10 defaults to -fno-common on all architectures except ARC, but this change is compatible with older GCC versions and ARC, too. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sunrpc')
| -rw-r--r-- | sunrpc/key_call.c | 8 | ||||
| -rw-r--r-- | sunrpc/rpc_common.c | 12 | ||||
| -rw-r--r-- | sunrpc/svcauth_des.c | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index f13b0a7e4c..8ea4303d7d 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -290,11 +290,9 @@ libc_hidden_nolink_sunrpc (key_get_conv, GLIBC_2_1) * implementations of these functions, and to call those in key_call(). */ -cryptkeyres *(*__key_encryptsession_pk_LOCAL) (uid_t, char *) - __attribute__ ((nocommon)); -cryptkeyres *(*__key_decryptsession_pk_LOCAL) (uid_t, char *) - __attribute__ ((nocommon)); -des_block *(*__key_gendes_LOCAL) (uid_t, char *) __attribute__ ((nocommon)); +cryptkeyres *(*__key_encryptsession_pk_LOCAL) (uid_t, char *); +cryptkeyres *(*__key_decryptsession_pk_LOCAL) (uid_t, char *); +des_block *(*__key_gendes_LOCAL) (uid_t, char *); #ifdef SHARED # ifndef EXPORT_RPC_SYMBOLS compat_symbol (libc, __key_encryptsession_pk_LOCAL, diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c index 05abab2a1d..97e90be89c 100644 --- a/sunrpc/rpc_common.c +++ b/sunrpc/rpc_common.c @@ -42,15 +42,13 @@ /* We are very tricky here. We want to have _null_auth in a read-only section but we cannot add const to the type because this isn't how the variable is declared. So we use the section attribute. */ -struct opaque_auth _null_auth __attribute__ ((nocommon)); +struct opaque_auth _null_auth; libc_hidden_nolink_sunrpc (_null_auth, GLIBC_2_0) -/* The variables need the nocommon attribute, so that it is possible - to create aliases and specify symbol versions. */ -fd_set svc_fdset __attribute__ ((nocommon)); -struct rpc_createerr rpc_createerr __attribute__ ((nocommon)); -struct pollfd *svc_pollfd __attribute__ ((nocommon)); -int svc_max_pollfd __attribute__ ((nocommon)); +fd_set svc_fdset; +struct rpc_createerr rpc_createerr; +struct pollfd *svc_pollfd; +int svc_max_pollfd; #ifdef SHARED # ifndef EXPORT_RPC_SYMBOLS compat_symbol (libc, svc_fdset, svc_fdset, GLIBC_2_0); diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c index 25a85c9097..dba66a0d77 100644 --- a/sunrpc/svcauth_des.c +++ b/sunrpc/svcauth_des.c @@ -93,7 +93,7 @@ struct u_long ncachereplays; /* times cache hit, and is replay */ u_long ncachemisses; /* times cache missed */ } -svcauthdes_stats __attribute__ ((nocommon)); +svcauthdes_stats; #ifdef SHARED compat_symbol (libc, svcauthdes_stats, svcauthdes_stats, GLIBC_2_0); #endif |