Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

[people/arne_f/ipfire-3.x.git] / gcc / gcc.nm

diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index 6bafedef544b23a29ea54853a0ff646af060e617..7ec6485e4b61335eb726dbf57316cc1af67d18b2 100644 (file)
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_cloog_ppl = 1
 
 name       = gcc
 version    = 4.6.2
-release    = 5
+release    = 7
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Compilers
@@ -221,7 +221,21 @@ build
 
                # Move libgcc_s to /lib
                mv -vf %{BUILDROOT}/usr/lib/libgcc_s.so.1 %{BUILDROOT}/lib/
-               ln -svf ../../lib/libgcc_s.so.1 %{BUILDROOT}/usr/lib/libgcc_s.so
+               case "%{DISTRO_ARCH}" in
+                       arm*)
+                               rm -f ${FULLPATH}/libgcc_s.so %{BUILDROOT}/usr/lib/libgcc_s.so
+                               cat <<EOF >${FULLPATH}/libgcc_s.so
+               /* GNU ld script
+                  Use the shared library, but some functions are only in
+                  the static library, so try that secondarily.  */
+               OUTPUT_FORMAT(elf32-littlearm)
+               GROUP ( /lib/libgcc_s.so.1 libgcc.a )
+               EOF
+                               ;;
+                       *)
+                               ln -svf ../../lib/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so
+                               ;;
+               esac
 
                # Remove some GNU debugger stuff.
                rm -vf %{BUILDROOT}/usr/lib/lib*.py