[meta-initramfs][PATCH] klibc: Add clang's -rtlib to known options

[meta-initramfs][PATCH] klibc: Add clang's -rtlib to known options

[Khem Raj]

This helps in ensuring that we always link klibc apps with libgcc as
compiler-rt does not work for klibc due to missing libssp functions e.g.
__stack_chk_guard and __stack_chk_guard which it expects in libc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andrea Adami <andrea.adami@gmail.com>
---
 .../klibc/files/klcc-cross-accept-clang-options.patch        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch b/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
index 56905a5159..431c75e3af 100644
--- a/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
+++ b/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
@@ -5,7 +5,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/klcc/klcc.in
 +++ b/klcc/klcc.in
-@@ -207,6 +207,24 @@ while ( defined($a = shift(@ARGV)) ) {
+@@ -207,6 +207,27 @@ while ( defined($a = shift(@ARGV)) ) {
      } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) {
  	# Override gcc encoded sysroot
  	push(@ccopt, $a);
@@ -26,6 +26,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 +	push(@ccopt, $a);
 +    } elsif ( $a =~ '--unwindlib=.*' ) {
 +	# Allow clang options
++	push(@ccopt, $a);
++    } elsif ( $a =~ '-rtlib=.*' ) {
++	# Allow clang options
 +	push(@ccopt, $a);
      } else {
  	die "$0: unknown option: $a\n";
-- 
2.32.0

Re: [meta-initramfs][PATCH] klibc: Add clang's -rtlib to known options

[Andrea Adami]

Thanks, I'll plan to do more testing with clang/llvm.

BTW there is now klibc 2.0.9.
Cheers
Andrea

On Fri, Jun 11, 2021 at 4:42 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> This helps in ensuring that we always link klibc apps with libgcc as
> compiler-rt does not work for klibc due to missing libssp functions e.g.
> __stack_chk_guard and __stack_chk_guard which it expects in libc
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Andrea Adami <andrea.adami@gmail.com>
> ---
>  .../klibc/files/klcc-cross-accept-clang-options.patch        | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch b/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
> index 56905a5159..431c75e3af 100644
> --- a/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
> +++ b/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
> @@ -5,7 +5,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
>  --- a/klcc/klcc.in
>  +++ b/klcc/klcc.in
> -@@ -207,6 +207,24 @@ while ( defined($a = shift(@ARGV)) ) {
> +@@ -207,6 +207,27 @@ while ( defined($a = shift(@ARGV)) ) {
>       } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) {
>         # Override gcc encoded sysroot
>         push(@ccopt, $a);
> @@ -26,6 +26,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>  +      push(@ccopt, $a);
>  +    } elsif ( $a =~ '--unwindlib=.*' ) {
>  +      # Allow clang options
> ++      push(@ccopt, $a);
> ++    } elsif ( $a =~ '-rtlib=.*' ) {
> ++      # Allow clang options
>  +      push(@ccopt, $a);
>       } else {
>         die "$0: unknown option: $a\n";
> --
> 2.32.0
>