[PATCH] Fix broken thumb2 build.

[PATCH] Fix broken thumb2 build.

[Marcus Shawcroft]

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

This patch fixes the broken ARM thumb2 build...

/Marcus

2012-11-14  Marcus Shawcroft  <marcus.shawcroft@linaro.org>

        * sysdeps/unix/sysv/linux/arm/Makefile (libcrypt-sysdep_routines): Add
        libc-do-syscall.

[-- Attachment #2: fix-build-thumb2.diff --]
[-- Type: application/octet-stream, Size: 504 bytes --]

diff --git a/ports/sysdeps/unix/sysv/linux/arm/Makefile b/ports/sysdeps/unix/sysv/linux/arm/Makefile
index d9eb10c..bda3ea9 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/Makefile
+++ b/ports/sysdeps/unix/sysv/linux/arm/Makefile
@@ -32,6 +32,10 @@ endif
 
 # Add a syscall function to each library that needs one.
 
+ifeq ($(subdir),crypt)
+libcrypt-sysdep_routines += libc-do-syscall
+endif
+
 ifeq ($(subdir),rt)
 librt-sysdep_routines += libc-do-syscall
 librt-shared-only-routines += libc-do-syscall

Re: [PATCH] Fix broken thumb2 build.

[Joseph S. Myers]

On Wed, 14 Nov 2012, Marcus Shawcroft wrote:

> This patch fixes the broken ARM thumb2 build...

OK, though please give more details of what the breakage is that you see 
and its cause.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH] Fix broken thumb2 build.

[Marcus Shawcroft]

On 14 November 2012 17:28, Joseph S. Myers <joseph@codesourcery.com> wrote:
> On Wed, 14 Nov 2012, Marcus Shawcroft wrote:
>
>> This patch fixes the broken ARM thumb2 build...
>
> OK, though please give more details of what the breakage is that you see
> and its cause.

The breakage occurs using a cross compiler configured:
--with-cpu=cortex-a9 --with-float=softfp --with-fpu=neon
--with-mode=thumb

The glibc build dies as follows:

make[2]: Entering directory `/foo/src/glibc/crypt'
/foo/build-arm-none-linux-gnueabi/install/bin/arm-none-linux-gnueabi-gcc
  -shared -static-libgcc -Wl,-O1  -Wl,-z,defs
-Wl,-dynamic-linker=/lib/ld-linux.so.3
-B/foo/build-arm-none-linux-gnueabi/obj/glibc/csu/
-Wl,--version-script=/foo/build-arm-none-linux-gnueabi/obj/glibc/libcrypt.map
-Wl,-soname=libcrypt.so.1 -Wl,-z,combreloc -Wl,-z,relro
-Wl,--hash-style=both  -L/foo/build-arm-none-linux-gnueabi/obj/glibc
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/math
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/elf
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/dlfcn
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/nss
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/nis
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/rt
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/resolv
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/crypt
-L/foo/build-arm-none-linux-gnueabi/obj/glibc/nptl
-Wl,-rpath-link=/foo/build-arm-none-linux-gnueabi/obj/glibc:/foo/build-arm-none-linux-gnueabi/obj/glibc/math:/foo/build-arm-none-linux-gnueabi/obj/glibc/elf:/foo/build-arm-none-linux-gnueabi/obj/glibc/dlfcn:/foo/build-arm-none-linux-gnueabi/obj/glibc/nss:/foo/build-arm-none-linux-gnueabi/obj/glibc/nis:/foo/build-arm-none-linux-gnueabi/obj/glibc/rt:/foo/build-arm-none-linux-gnueabi/obj/glibc/resolv:/foo/build-arm-none-linux-gnueabi/obj/glibc/crypt:/foo/build-arm-none-linux-gnueabi/obj/glibc/nptl
-o /foo/build-arm-none-linux-gnueabi/obj/glibc/crypt/libcrypt.so -T
/foo/build-arm-none-linux-gnueabi/obj/glibc/shlib.lds
/foo/build-arm-none-linux-gnueabi/obj/glibc/csu/abi-note.o
-Wl,--whole-archive
/foo/build-arm-none-linux-gnueabi/obj/glibc/crypt/libcrypt_pic.a
-Wl,--no-whole-archive
/foo/build-arm-none-linux-gnueabi/obj/glibc/elf/interp.os
/foo/build-arm-none-linux-gnueabi/obj/glibc/libc.so
/foo/build-arm-none-linux-gnueabi/obj/glibc/libc_nonshared.a
/foo/build-arm-none-linux-gnueabi/obj/glibc/crypt/libcrypt_pic.a(crypt-entry.os):
In function `fips_enabled_p':
/foo/src/glibc/crypt/../sysdeps/unix/sysv/linux/fips-private.h:45:
undefined reference to `__libc_do_syscall'
/foo/src/glibc/crypt/../sysdeps/unix/sysv/linux/fips-private.h:52:
undefined reference to `__libc_do_syscall'
/foo/src/glibc/crypt/../sysdeps/unix/sysv/linux/fips-private.h:53:
undefined reference to `__libc_do_syscall'
/foo/src/glibc/crypt/../sysdeps/unix/sysv/linux/fips-private.h:45:
undefined reference to `__libc_do_syscall'
/foo/src/glibc/crypt/../sysdeps/unix/sysv/linux/fips-private.h:52:
undefined reference to `__libc_do_syscall'
/foo/build-arm-none-linux-gnueabi/obj/glibc/crypt/libcrypt_pic.a(crypt-entry.os):/foo/src/glibc/crypt/../sysdeps/unix/sysv/linux/fips-private.h:53:
more undefined references to `__libc_do_syscall' follow
collect2: error: ld returned 1 exit status

Cheers
/Marcus

Re: [PATCH] Fix broken thumb2 build.

[Joseph S. Myers]

On Wed, 14 Nov 2012, Marcus Shawcroft wrote:

> In function `fips_enabled_p':
> /foo/src/glibc/crypt/../sysdeps/unix/sysv/linux/fips-private.h:45:
> undefined reference to `__libc_do_syscall'

Thanks.  As I said, the patch is OK.  But you need to give such details 
(in this case, that the FIPS changes had introduced direct syscalls to 
libcrypt that were not present previously) when sending a patch to fix a 
problem; I'm not aware of any previous reports of this problem, whether on 
libc-ports or in Bugzilla, so didn't know what breakage you were referring 
to.

-- 
Joseph S. Myers
joseph@codesourcery.com