Re: CBL issue #431: lld: x86_64: sysfs: cannot create duplicate filename $module/.rodata.cst{16,32}

[Denys Vlasenko]

On 4/8/19 4:23 PM, Sedat Dilek wrote:
> For the .rodata.cst16 part you mean sth. like this?

yes, see below

> --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
> +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
> @@ -573,8 +573,12 @@
> ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
>          vmovdqu y7, 15 * 16(rio);
>
>
> -/* NB: section is mergeable, all elements must be aligned 16-byte blocks */
> -.section       .rodata.cst16, "aM", @progbits, 16
> +/*
> + * NB: section is mergeable, all elements must be aligned 16-byte blocks
> + * There is more than one object in this section, let's use module name
> + * instead of object name as unique suffix
> + */
> +.section        .rodata.cst16.camellia-aesni-avx-asm_64, "aM", @progbits, 16

dashes in the name may cause problems, replace with '_'.

>   .align 16
>
>   #define SHUFB_BYTES(idx) \
> diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
> b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
> index b66bbfa62f50..d6ce36e82a93 100644
> --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
> +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
> @@ -626,8 +626,12 @@
> ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
>          .long 0x00010203, 0x04050607, 0x80808080, 0x80808080
>          .long 0x00010203, 0x04050607, 0x80808080, 0x80808080
>
> -/* NB: section is mergeable, all elements must be aligned 16-byte blocks */
> -.section       .rodata.cst16, "aM", @progbits, 16
> +/*
> + * NB: section is mergeable, all elements must be aligned 16-byte blocks
> + * There is more than one object in this section, let's use module name
> + * instead of object name as unique suffix
> +*/
> +.section        .rodata.cst16.ccamellia-aesni-avx2-asm_64, "aM", @progbits, 16

dashes in the name may cause problems, replace with '_'.