| Index: gdb/dwarf2loc.h
 | 
| diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
 | 
| index e9d06a330d3e3b6c12183682619cf708390b645a..9bc8ca5d8fa78946b7a1c42ae04fdc339d4d4cb8 100644
 | 
| --- a/gdb/dwarf2loc.h
 | 
| +++ b/gdb/dwarf2loc.h
 | 
| @@ -1,6 +1,6 @@
 | 
|  /* DWARF 2 location expression support for GDB.
 | 
|  
 | 
| -   Copyright (C) 2003, 2005, 2007-2012 Free Software Foundation, Inc.
 | 
| +   Copyright (C) 2003-2013 Free Software Foundation, Inc.
 | 
|  
 | 
|     This file is part of GDB.
 | 
|  
 | 
| @@ -33,7 +33,7 @@ struct axs_value;
 | 
|     dwarf2read.c and dwarf2loc.c.  */
 | 
|  
 | 
|  /* `set debug entry-values' setting.  */
 | 
| -extern int entry_values_debug;
 | 
| +extern unsigned int entry_values_debug;
 | 
|  
 | 
|  /* Return the OBJFILE associated with the compilation unit CU.  If CU
 | 
|     came from a separate debuginfo file, then the master objfile is
 | 
| @@ -62,11 +62,21 @@ const gdb_byte *dwarf2_find_location_expression
 | 
|     size_t *locexpr_length,
 | 
|     CORE_ADDR pc);
 | 
|  
 | 
| -struct dwarf2_locexpr_baton dwarf2_fetch_die_location_block
 | 
| +struct dwarf2_locexpr_baton dwarf2_fetch_die_loc_sect_off
 | 
| +  (sect_offset offset_in_cu, struct dwarf2_per_cu_data *per_cu,
 | 
| +   CORE_ADDR (*get_frame_pc) (void *baton),
 | 
| +   void *baton);
 | 
| +
 | 
| +struct dwarf2_locexpr_baton dwarf2_fetch_die_loc_cu_off
 | 
|    (cu_offset offset_in_cu, struct dwarf2_per_cu_data *per_cu,
 | 
|     CORE_ADDR (*get_frame_pc) (void *baton),
 | 
|     void *baton);
 | 
|  
 | 
| +extern const gdb_byte *dwarf2_fetch_constant_bytes (sect_offset,
 | 
| +						    struct dwarf2_per_cu_data *,
 | 
| +						    struct obstack *,
 | 
| +						    LONGEST *);
 | 
| +
 | 
|  struct type *dwarf2_get_die_type (cu_offset die_offset,
 | 
|  				  struct dwarf2_per_cu_data *per_cu);
 | 
|  
 | 
| @@ -77,7 +87,7 @@ struct type *dwarf2_get_die_type (cu_offset die_offset,
 | 
|  struct value *dwarf2_evaluate_loc_desc (struct type *type,
 | 
|  					struct frame_info *frame,
 | 
|  					const gdb_byte *data,
 | 
| -					unsigned short size,
 | 
| +					size_t size,
 | 
|  					struct dwarf2_per_cu_data *per_cu);
 | 
|  
 | 
|  CORE_ADDR dwarf2_read_addr_index (struct dwarf2_per_cu_data *per_cu,
 | 
| @@ -97,7 +107,7 @@ struct dwarf2_locexpr_baton
 | 
|  
 | 
|    /* Length of the location expression.  For optimized out expressions it is
 | 
|       zero.  */
 | 
| -  unsigned long size;
 | 
| +  size_t size;
 | 
|  
 | 
|    /* The compilation unit containing the symbol whose location
 | 
|       we're computing.  */
 | 
| @@ -114,7 +124,7 @@ struct dwarf2_loclist_baton
 | 
|    const gdb_byte *data;
 | 
|  
 | 
|    /* Length of the location list.  */
 | 
| -  unsigned long size;
 | 
| +  size_t size;
 | 
|  
 | 
|    /* The compilation unit containing the symbol whose location
 | 
|       we're computing.  */
 | 
| @@ -128,6 +138,9 @@ struct dwarf2_loclist_baton
 | 
|  extern const struct symbol_computed_ops dwarf2_locexpr_funcs;
 | 
|  extern const struct symbol_computed_ops dwarf2_loclist_funcs;
 | 
|  
 | 
| +extern const struct symbol_block_ops dwarf2_block_frame_base_locexpr_funcs;
 | 
| +extern const struct symbol_block_ops dwarf2_block_frame_base_loclist_funcs;
 | 
| +
 | 
|  /* Compile a DWARF location expression to an agent expression.
 | 
|     
 | 
|     EXPR is the agent expression we are building.
 | 
| 
 |