diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-26 17:10:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-26 17:10:16 +0000 |
| commit | db237e33c08a279f0179f8f5128a6d10d9adc38a (patch) | |
| tree | b30b3231ed07a78cbca3cdc977ad82d944e28263 | |
| parent | 61898bc020c3367c629a99a2abdaa1c60fce76cd (diff) | |
| parent | ad1c7e0faac82eeb654cba7f99d4e6d88273e0f9 (diff) | |
Merge remote-tracking branch 'remotes/riku/for-2.0' into staging
* remotes/riku/for-2.0:
linux-user: Correct DLINFO_ITEMS
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | linux-user/elfload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 99a2c586eb..d2380b6ccb 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -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) { |