arch: um: fix error when linking vmlinux.
authorLorenzo Colitti <lorenzo@google.com>
Wed, 18 Nov 2015 14:12:09 +0000 (23:12 +0900)
committerRichard Weinberger <richard@nod.at>
Tue, 8 Dec 2015 21:25:13 +0000 (22:25 +0100)
commitfb1770aa78a43530940d0c2dd161e77bc705bdac
tree66ccbc55fca82142f74b9705c90b75cdcf9e24bb
parentdb2f24dc240856fb1d78005307f1523b7b3c121b
arch: um: fix error when linking vmlinux.

On gcc Ubuntu 4.8.4-2ubuntu1~14.04, linking vmlinux fails with:

arch/um/os-Linux/built-in.o: In function `os_timer_create':
/android/kernel/android/arch/um/os-Linux/time.c:51: undefined reference to `timer_create'
arch/um/os-Linux/built-in.o: In function `os_timer_set_interval':
/android/kernel/android/arch/um/os-Linux/time.c:84: undefined reference to `timer_settime'
arch/um/os-Linux/built-in.o: In function `os_timer_remain':
/android/kernel/android/arch/um/os-Linux/time.c:109: undefined reference to `timer_gettime'
arch/um/os-Linux/built-in.o: In function `os_timer_one_shot':
/android/kernel/android/arch/um/os-Linux/time.c:132: undefined reference to `timer_settime'
arch/um/os-Linux/built-in.o: In function `os_timer_disable':
/android/kernel/android/arch/um/os-Linux/time.c:145: undefined reference to `timer_settime'

This is because -lrt appears in the generated link commandline
after arch/um/os-Linux/built-in.o. Fix this by removing -lrt from
arch/um/Makefile and adding it to the UM-specific section of
scripts/link-vmlinux.sh.

Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/Makefile
scripts/link-vmlinux.sh