diff options
| author | Alan Modra <modra@gmail.com> | 2013-01-21 17:48:46 +0400 |
|---|---|---|
| committer | Alan Modra <modra@gmail.com> | 2013-01-21 17:48:46 +0400 |
| commit | 99b26394fbfabfc2a62d0e8272f118c8037dc970 (patch) | |
| tree | e1d071a8bb3b8a28d4650a921108e1e838f2107c | |
| parent | 5a588340482fd2367bc6332d88c5233801c02bcb (diff) | |
PR 12549
PR 14493
PR 14567
PR 14662
PR 14758
PR 14813
PR 14904
PR 14915
PR 14926
PR 14950
PR 14962
Apply mainline patches
| -rw-r--r-- | include/opcode/ChangeLog | 6 | ||||
| -rw-r--r-- | include/opcode/ppc.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 1f64fb86c..94cba871a 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,9 @@ +2013-01-22 Alan Modra <amodra@gmail.com> + + Apply mainline patches + 2012-11-23 Alan Modra <amodra@gmail.com> + * ppc.h (ppc_parse_cpu): Update prototype. + 2012-08-13 Richard Sandiford <rdsandiford@googlemail.com> Maciej W. Rozycki <macro@codesourcery.com> diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h index 2e789d6ff..e57b118b0 100644 --- a/include/opcode/ppc.h +++ b/include/opcode/ppc.h @@ -400,6 +400,6 @@ struct powerpc_macro extern const struct powerpc_macro powerpc_macros[]; extern const int powerpc_num_macros; -extern ppc_cpu_t ppc_parse_cpu (ppc_cpu_t, const char *); +extern ppc_cpu_t ppc_parse_cpu (ppc_cpu_t, ppc_cpu_t *, const char *); #endif /* PPC_H */ |