Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb1770aa authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Richard Weinberger
Browse files

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: default avatarLorenzo Colitti <lorenzo@google.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent db2f24dc

arch/um/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ export LDS_ELF_FORMAT := $(ELF_FORMAT) 
# The wrappers will select whether using "malloc" or the kernel allocator.

LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc



LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt)) -lrt

LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt))



# Used by link-vmlinux.sh which has special support for um link

export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)

scripts/link-vmlinux.sh

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ vmlinux_link() 
			-Wl,--start-group                                    \

				 ${KBUILD_VMLINUX_MAIN}                      \

			-Wl,--end-group                                      \

			-lutil ${1}

			-lutil -lrt ${1}

		rm -f linux

	fi

}