| Index: gcc/gcc/recog.h | 
| diff --git a/gcc/gcc/recog.h b/gcc/gcc/recog.h | 
| index f2b1f6e44048c3142d4ebd2fb2b52a39fab9119b..3354a66496a4508d5fcddc3517b40240f0c67fae 100644 | 
| --- a/gcc/gcc/recog.h | 
| +++ b/gcc/gcc/recog.h | 
| @@ -84,8 +84,14 @@ extern int num_validated_changes (void); | 
| extern void cancel_changes (int); | 
| extern int constrain_operands (int); | 
| extern int constrain_operands_cached (int); | 
| -extern int memory_address_p (enum machine_mode, rtx); | 
| -extern int strict_memory_address_p (enum machine_mode, rtx); | 
| +extern int memory_address_addr_space_p (enum machine_mode, rtx, addr_space_t); | 
| +#define memory_address_p(mode,addr) \ | 
| +	memory_address_addr_space_p ((mode), (addr), ADDR_SPACE_GENERIC) | 
| +extern int strict_memory_address_addr_space_p (enum machine_mode, rtx, | 
| +					       addr_space_t); | 
| +#define strict_memory_address_p(mode,addr) \ | 
| +	strict_memory_address_addr_space_p ((mode), (addr), ADDR_SPACE_GENERIC) | 
| +extern int validate_replace_rtx_subexp (rtx, rtx, rtx, rtx *); | 
| extern int validate_replace_rtx (rtx, rtx, rtx); | 
| extern int validate_replace_rtx_part (rtx, rtx, rtx *, rtx); | 
| extern int validate_replace_rtx_part_nosimplify (rtx, rtx, rtx *, rtx); | 
| @@ -100,7 +106,11 @@ extern int reg_fits_class_p (rtx, enum reg_class, int, enum machine_mode); | 
|  | 
| extern int offsettable_memref_p (rtx); | 
| extern int offsettable_nonstrict_memref_p (rtx); | 
| -extern int offsettable_address_p (int, enum machine_mode, rtx); | 
| +extern int offsettable_address_addr_space_p (int, enum machine_mode, rtx, | 
| +					     addr_space_t); | 
| +#define offsettable_address_p(strict,mode,addr) \ | 
| +	offsettable_address_addr_space_p ((strict), (mode), (addr), \ | 
| +					  ADDR_SPACE_GENERIC) | 
| extern int mode_dependent_address_p (rtx); | 
|  | 
| extern int recog (rtx, rtx, int *); | 
|  |