Replace ARG_MAX with ARG_LAST
We define an enum ARG_MAX in linux_infcall_mmap, but it is conflict with macro ARG_MAX which is defined in /usr/include/linux/limits.h. This causes a build failure below, gdb/linux-tdep.c: In function 'linux_infcall_mmap': gdb/linux-tdep.c:1945:70: error: expected identifier before numeric constant the enum in the pre-processed source becomes: enum { ARG_ADDR, ARG_LENGTH, ARG_PROT, ARG_FLAGS, ARG_FD, ARG_OFFSET, 131072 }; This patch is to replace ARG_MAX with ARG_LAST. gdb: 2014-12-16 Yao Qi <yao@codesourcery.com> * linux-tdep.c (linux_infcall_mmap): Replace ARG_MAX with ARG_LAST.
This commit is contained in:
parent
395cf596db
commit
2a54636794
|
@ -1,3 +1,8 @@
|
||||||
|
2014-12-16 Yao Qi <yao@codesourcery.com>
|
||||||
|
|
||||||
|
* linux-tdep.c (linux_infcall_mmap): Replace ARG_MAX with
|
||||||
|
ARG_LAST.
|
||||||
|
|
||||||
2014-12-15 Simon Marchi <simon.marchi@ericsson.com>
|
2014-12-15 Simon Marchi <simon.marchi@ericsson.com>
|
||||||
|
|
||||||
* inferior.c (find_inferior_ptid): New function.
|
* inferior.c (find_inferior_ptid): New function.
|
||||||
|
|
|
@ -1942,9 +1942,9 @@ linux_infcall_mmap (CORE_ADDR size, unsigned prot)
|
||||||
CORE_ADDR retval;
|
CORE_ADDR retval;
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
ARG_ADDR, ARG_LENGTH, ARG_PROT, ARG_FLAGS, ARG_FD, ARG_OFFSET, ARG_MAX
|
ARG_ADDR, ARG_LENGTH, ARG_PROT, ARG_FLAGS, ARG_FD, ARG_OFFSET, ARG_LAST
|
||||||
};
|
};
|
||||||
struct value *arg[ARG_MAX];
|
struct value *arg[ARG_LAST];
|
||||||
|
|
||||||
arg[ARG_ADDR] = value_from_pointer (builtin_type (gdbarch)->builtin_data_ptr,
|
arg[ARG_ADDR] = value_from_pointer (builtin_type (gdbarch)->builtin_data_ptr,
|
||||||
0);
|
0);
|
||||||
|
@ -1961,7 +1961,7 @@ linux_infcall_mmap (CORE_ADDR size, unsigned prot)
|
||||||
arg[ARG_FD] = value_from_longest (builtin_type (gdbarch)->builtin_int, -1);
|
arg[ARG_FD] = value_from_longest (builtin_type (gdbarch)->builtin_int, -1);
|
||||||
arg[ARG_OFFSET] = value_from_longest (builtin_type (gdbarch)->builtin_int64,
|
arg[ARG_OFFSET] = value_from_longest (builtin_type (gdbarch)->builtin_int64,
|
||||||
0);
|
0);
|
||||||
addr_val = call_function_by_hand (mmap_val, ARG_MAX, arg);
|
addr_val = call_function_by_hand (mmap_val, ARG_LAST, arg);
|
||||||
retval = value_as_address (addr_val);
|
retval = value_as_address (addr_val);
|
||||||
if (retval == (CORE_ADDR) -1)
|
if (retval == (CORE_ADDR) -1)
|
||||||
error (_("Failed inferior mmap call for %s bytes, errno is changed."),
|
error (_("Failed inferior mmap call for %s bytes, errno is changed."),
|
||||||
|
|
Loading…
Reference in New Issue