[prev in list] [next in list] [prev in thread] [next in thread] 

List:       selinux
Subject:    Re: [PATCH] libsepol: Add symver with explicit version to build with ld.gold
From:       Stephen Smalley <sds () tycho ! nsa ! gov>
Date:       2016-10-31 16:52:59
Message-ID: 25a41cd3-ff3b-4db7-f1ce-3325e981a237 () tycho ! nsa ! gov
[Download RAW message or body]

On 10/31/2016 11:52 AM, Jason Zaman wrote:
> The blank default symver fails to compile with ld.gold. This updates the
> symver from blank to LIBSEPOL_1.0. The dynamic linker will first look
> for the symbol with the explicit version specified. If there is none, it
> will pick the first listed symbol so there is no breakage.
> This also matches how symvers are defined in libsemanage.

Thanks, applied.

> 
> Signed-off-by: Jason Zaman <jason@perfinion.com>
> ---
>  libsepol/cil/src/cil.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c
> index 929ab19..9b18773 100644
> --- a/libsepol/cil/src/cil.c
> +++ b/libsepol/cil/src/cil.c
> @@ -53,19 +53,19 @@
>  #include "dso.h"
>  
>  #ifndef DISABLE_SYMVER
> -asm(".symver cil_build_policydb_pdb,        cil_build_policydb@");
> +asm(".symver cil_build_policydb_pdb,        cil_build_policydb@LIBSEPOL_1.0");
>  asm(".symver cil_build_policydb_create_pdb, cil_build_policydb@@LIBSEPOL_1.1");
>  
> -asm(".symver cil_compile_pdb,   cil_compile@");
> +asm(".symver cil_compile_pdb,   cil_compile@LIBSEPOL_1.0");
>  asm(".symver cil_compile_nopdb, cil_compile@@LIBSEPOL_1.1");
>  
> -asm(".symver cil_userprefixes_to_string_pdb,   cil_userprefixes_to_string@");
> +asm(".symver cil_userprefixes_to_string_pdb,   cil_userprefixes_to_string@LIBSEPOL_1.0");
>  asm(".symver cil_userprefixes_to_string_nopdb, cil_userprefixes_to_string@@LIBSEPOL_1.1");
>  
> -asm(".symver cil_selinuxusers_to_string_pdb,   cil_selinuxusers_to_string@");
> +asm(".symver cil_selinuxusers_to_string_pdb,   cil_selinuxusers_to_string@LIBSEPOL_1.0");
>  asm(".symver cil_selinuxusers_to_string_nopdb, cil_selinuxusers_to_string@@LIBSEPOL_1.1");
>  
> -asm(".symver cil_filecons_to_string_pdb,   cil_filecons_to_string@");
> +asm(".symver cil_filecons_to_string_pdb,   cil_filecons_to_string@LIBSEPOL_1.0");
>  asm(".symver cil_filecons_to_string_nopdb, cil_filecons_to_string@@LIBSEPOL_1.1");
>  #endif
>  
> 

_______________________________________________
Selinux mailing list
Selinux@tycho.nsa.gov
To unsubscribe, send email to Selinux-leave@tycho.nsa.gov.
To get help, send an email containing "help" to Selinux-request@tycho.nsa.gov.
[prev in list] [next in list] [prev in thread] [next in thread]