diff options
| author | Anthony Martin <ality@pbrane.org> | 2014-02-12 14:29:11 -0500 |
|---|---|---|
| committer | Anthony Martin <ality@pbrane.org> | 2014-02-12 14:29:11 -0500 |
| commit | 4fd1804be969e00451508f1b97dfb461627b4f7e (patch) | |
| tree | 7d3f8b41fa060fcb9cfb363882968a82484294ed /include | |
| parent | 334bd5a56c780acc2f0640042637906f698bab71 (diff) | |
| download | go-4fd1804be969e00451508f1b97dfb461627b4f7e.tar.gz | |
cmd/cc, cmd/gc, cmd/ld: consolidate print format routines
We now use the %A, %D, %P, and %R routines from liblink
across the board.
Fixes issue 7178.
Fixes issue 7055.
LGTM=iant
R=golang-codereviews, gobot, rsc, dave, iant, remyoudompheng
CC=golang-codereviews
https://codereview.appspot.com/49170043
Committer: Russ Cox <rsc@golang.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/link.h | 11 | ||||
| -rw-r--r-- | include/plan9/link.h | 12 |
2 files changed, 10 insertions, 13 deletions
diff --git a/include/link.h b/include/link.h index e040e203f..3ddda7ae1 100644 --- a/include/link.h +++ b/include/link.h @@ -95,7 +95,6 @@ struct Prog Addr to; // for 5g, 6g, 8g internal use - uint32 loc; // TODO: merge with pc? void* opt; // for 5l, 6l, 8l internal use @@ -565,3 +564,13 @@ extern char* anames8[]; extern LinkArch link386; extern LinkArch linkamd64; extern LinkArch linkarm; + +#pragma varargck type "A" int +#pragma varargck type "D" Addr* +#pragma varargck type "lD" Addr* +#pragma varargck type "P" Prog* +#pragma varargck type "R" int + +// TODO(ality): remove this workaround. +// It's here because Pconv in liblink/list?.c references %L. +#pragma varargck type "L" int32 diff --git a/include/plan9/link.h b/include/plan9/link.h index b49926027..f65971efc 100644 --- a/include/plan9/link.h +++ b/include/plan9/link.h @@ -3,15 +3,3 @@ // license that can be found in the LICENSE file. #include "../link.h" - -#pragma varargck type "@" Addr* -#pragma varargck type "A" int -#pragma varargck type "$" char* -#pragma varargck type "D" Addr* -#pragma varargck type "lD" Addr* -#pragma varargck type "L" int -#pragma varargck type "lS" LSym* -#pragma varargck type "M" Addr* -#pragma varargck type "P" Prog* -#pragma varargck type "R" int -#pragma varargck type "S" char* |