diff mbox

[U-Boot] arm: add __aeabi_unwind_cpp_pr1() function to avoid linker complaints

Message ID 4EBBBAC1.7040803@grandegger.com
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Wolfgang Grandegger Nov. 10, 2011, 11:51 a.m. UTC
With the ELDK 5.1 (beta) "armv7a" toolchain I'm get the following
build failure:

  $ ./MAKEALL mx51evk
  ...
  /opt/eldk-5.1/armv7a/sysroots/arm-linux-gnueabi/usr/lib/arm-linux-
  gnueabi/4.6.1/libgcc.a(bpabi.o):(.ARM.exidx+0x0): undefined
  reference to `__aeabi_unwind_cpp_pr1'
  make: *** [u-boot] Error 1

This patch fixes the issue similar to commit
d442b6e7ad6a86e2fd0e6297291fe8872ff26fc6 but I don't know if it's
general enough or if it does harm when using other toolchains.

Signed-off-by: Wolfgang Grandegger <wg@denx.de>
---
 arch/arm/lib/eabi_compat.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Comments

Albert ARIBAUD Dec. 11, 2011, 1:01 p.m. UTC | #1
Hi Wolfgang,

Le 10/11/2011 12:51, Wolfgang Grandegger a écrit :
> With the ELDK 5.1 (beta) "armv7a" toolchain I'm get the following
> build failure:
>
>    $ ./MAKEALL mx51evk
>    ...
>    /opt/eldk-5.1/armv7a/sysroots/arm-linux-gnueabi/usr/lib/arm-linux-
>    gnueabi/4.6.1/libgcc.a(bpabi.o):(.ARM.exidx+0x0): undefined
>    reference to `__aeabi_unwind_cpp_pr1'
>    make: *** [u-boot] Error 1
>
> This patch fixes the issue similar to commit
> d442b6e7ad6a86e2fd0e6297291fe8872ff26fc6 but I don't know if it's
> general enough or if it does harm when using other toolchains.
>
> Signed-off-by: Wolfgang Grandegger<wg@denx.de>
> ---
>   arch/arm/lib/eabi_compat.c |    5 +++++
>   1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
> index eb3e26d..2207c88 100644
> --- a/arch/arm/lib/eabi_compat.c
> +++ b/arch/arm/lib/eabi_compat.c
> @@ -21,3 +21,8 @@ int raise (int signum)
>   void __aeabi_unwind_cpp_pr0(void)
>   {
>   };
> +
> +void __aeabi_unwind_cpp_pr1(void)
> +{
> +};
> +

Applied to u-boot-arm/master, with a minor tweak: removal of the blank 
line at end of patch which git was complaining about. Again, hope 
Wolfgang D will accept a last-day pull request.

Amicalement,
diff mbox

Patch

diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index eb3e26d..2207c88 100644
--- a/arch/arm/lib/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
@@ -21,3 +21,8 @@  int raise (int signum)
 void __aeabi_unwind_cpp_pr0(void)
 {
 };
+
+void __aeabi_unwind_cpp_pr1(void)
+{
+};
+