Commit db237e33 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/riku/for-2.0' into staging 



* remotes/riku/for-2.0:
  linux-user: Correct DLINFO_ITEMS

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 61898bc0 ad1c7e0f

linux-user/elfload.c

+1 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ struct exec 
#define TARGET_ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(TARGET_ELF_EXEC_PAGESIZE-1))

#define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1))



#define DLINFO_ITEMS 13

#define DLINFO_ITEMS 14



static inline void memcpy_fromfs(void * to, const void * from, unsigned long n)

{