cmd/5c, cmd/5g, cmd/5l: fix cross compilation failure on darwin

Fixes #3708.

The fix to allow 5{c,g,l} to compile under clang 3.1 broke cross
compilation on darwin using the Apple default compiler on 10.7.3.

This failure was introduced in 9b455eb64690.

This has been tested by cross compiling on darwin/amd64 to linux/arm using

* gcc version 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.1.00)
* clang version 3.1 (branches/release_31)

As well as on linux/arm using

* gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
* Ubuntu clang version 3.0-6ubuntu3 (tags/RELEASE_30/final) (based on LLVM 3.0)
* Debian clang version 3.1-4 (branches/release_31) (based on LLVM 3.1)

R=consalus, rsc
CC=golang-dev
https://golang.org/cl/6307058

diff --git a/src/cmd/5c/list.c b/src/cmd/5c/list.c
index 86a31ae7a9da6a67e2eff03a1970cfed08899c59..30b88400fe9b60dd8e852c8028189ce4f11429c5 100644 (file)
--- a/src/cmd/5c/list.c
+++ b/src/cmd/5c/list.c
@@ -140,7 +140,7 @@ Dconv(Fmt *fp)
 {
        char str[STRINGSZ];
        Adr *a;
-       char *op;
+       const char *op;
        int v;
 
        a = va_arg(fp->args, Adr*);

diff --git a/src/cmd/5g/list.c b/src/cmd/5g/list.c
index 13e187145c2fd146cb52ea1431d54ab440779441..25969369566f4ee5d17be3d28454853dd59c6f44 100644 (file)
--- a/src/cmd/5g/list.c
+++ b/src/cmd/5g/list.c
@@ -83,7 +83,7 @@ int
 Dconv(Fmt *fp)
 {
        char str[STRINGSZ];
-       char *op;
+       const char *op;
        Addr *a;
        int i;
        int32 v;

diff --git a/src/cmd/5l/list.c b/src/cmd/5l/list.c
index 2fd69edeb8f4b5f683119b287ed8eb1cc58bb2e8..d05ec3b95d1915461356e5c55aae0ab838d530a0 100644 (file)
--- a/src/cmd/5l/list.c
+++ b/src/cmd/5l/list.c
@@ -161,7 +161,7 @@ int
 Dconv(Fmt *fp)
 {
        char str[STRINGSZ];
-       char *op;
+       const char *op;
        Adr *a;
        int32 v;