summaryrefslogtreecommitdiff
path: root/src/cmd/dist/build.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd/dist/build.c')
-rw-r--r--src/cmd/dist/build.c218
1 files changed, 161 insertions, 57 deletions
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index 7f9aa7bcd..dda45ca62 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -16,6 +16,8 @@ char *gohostarch;
char *gohostchar;
char *gohostos;
char *goos;
+char *goarm;
+char *go386;
char *goroot = GOROOT_FINAL;
char *goroot_final = GOROOT_FINAL;
char *workdir;
@@ -96,6 +98,20 @@ init(void)
if(find(goos, okgoos, nelem(okgoos)) < 0)
fatal("unknown $GOOS %s", goos);
+ xgetenv(&b, "GOARM");
+ if(b.len == 0)
+ bwritestr(&b, xgetgoarm());
+ goarm = btake(&b);
+
+ xgetenv(&b, "GO386");
+ if(b.len == 0) {
+ if(cansse2())
+ bwritestr(&b, "sse2");
+ else
+ bwritestr(&b, "387");
+ }
+ go386 = btake(&b);
+
p = bpathf(&b, "%s/include/u.h", goroot);
if(!isfile(p)) {
fatal("$GOROOT is not set correctly or not exported\n"
@@ -126,6 +142,8 @@ init(void)
xsetenv("GOROOT", goroot);
xsetenv("GOARCH", goarch);
xsetenv("GOOS", goos);
+ xsetenv("GOARM", goarm);
+ xsetenv("GO386", go386);
// Make the environment more predictable.
xsetenv("LANG", "C");
@@ -147,7 +165,7 @@ static void
rmworkdir(void)
{
if(vflag > 1)
- xprintf("rm -rf %s\n", workdir);
+ errprintf("rm -rf %s\n", workdir);
xremoveall(workdir);
}
@@ -207,7 +225,7 @@ findgoversion(void)
chomp(&branch);
// What are the tags along the current branch?
- tag = "";
+ tag = "devel";
rev = ".";
run(&b, goroot, CheckExit, "hg", "log", "-b", bstr(&branch), "-r", ".:0", "--template", "{tags} + ", nil);
splitfields(&tags, bstr(&b));
@@ -216,7 +234,9 @@ findgoversion(void)
p = tags.p[i];
if(streq(p, "+"))
nrev++;
- if(hasprefix(p, "release.") || hasprefix(p, "weekly.") || hasprefix(p, "go")) {
+ // NOTE: Can reenable the /* */ code when we want to
+ // start reporting versions named 'weekly' again.
+ if(/*hasprefix(p, "weekly.") ||*/ hasprefix(p, "go")) {
tag = xstrdup(p);
// If this tag matches the current checkout
// exactly (no "+" yet), don't show extra
@@ -236,7 +256,7 @@ findgoversion(void)
if(rev[0]) {
// Tag is before the revision we're building.
// Add extra information.
- run(&bmore, goroot, CheckExit, "hg", "log", "--template", " +{node|short}", "-r", rev, nil);
+ run(&bmore, goroot, CheckExit, "hg", "log", "--template", " +{node|short} {date|date}", "-r", rev, nil);
chomp(&bmore);
}
@@ -378,6 +398,9 @@ setup(void)
// gccargs is the gcc command line to use for compiling a single C file.
static char *proto_gccargs[] = {
"-Wall",
+ // native Plan 9 compilers don't like non-standard prototypes
+ // so let gcc catch them.
+ "-Wstrict-prototypes",
"-Wno-sign-compare",
"-Wno-missing-braces",
"-Wno-parentheses",
@@ -387,7 +410,14 @@ static char *proto_gccargs[] = {
"-Werror",
"-fno-common",
"-ggdb",
+ "-pipe",
+#if defined(__NetBSD__) && defined(__arm__)
+ // GCC 4.5.4 (NetBSD nb1 20120916) on ARM is known to mis-optimize gc/mparith3.c
+ // Fix available at http://patchwork.ozlabs.org/patch/64562/.
+ "-O1",
+#else
"-O2",
+#endif
};
static Vec gccargs;
@@ -474,14 +504,7 @@ static struct {
"$GOROOT/pkg/obj/$GOOS_$GOARCH/libgc.a",
}},
{"cmd/5l", {
- "../ld/data.c",
- "../ld/elf.c",
- "../ld/go.c",
- "../ld/ldelf.c",
- "../ld/ldmacho.c",
- "../ld/ldpe.c",
- "../ld/lib.c",
- "../ld/symtab.c",
+ "../ld/*",
"enam.c",
}},
{"cmd/6l", {
@@ -535,17 +558,17 @@ static void
install(char *dir)
{
char *name, *p, *elem, *prefix, *exe;
- bool islib, ispkg, isgo, stale;
+ bool islib, ispkg, isgo, stale, clang;
Buf b, b1, path;
Vec compile, files, link, go, missing, clean, lib, extra;
Time ttarg, t;
- int i, j, k, n, doclean, targ;
+ int i, j, k, n, doclean, targ, usecpp;
if(vflag) {
if(!streq(goos, gohostos) || !streq(goarch, gohostarch))
- xprintf("%s (%s/%s)\n", dir, goos, goarch);
+ errprintf("%s (%s/%s)\n", dir, goos, goarch);
else
- xprintf("%s\n", dir);
+ errprintf("%s\n", dir);
}
binit(&b);
@@ -560,6 +583,7 @@ install(char *dir)
vinit(&lib);
vinit(&extra);
+
// path = full path to dir.
bpathf(&path, "%s/src/%s", goroot, dir);
name = lastelem(dir);
@@ -574,7 +598,7 @@ install(char *dir)
// For release, cmd/prof and cmd/cov are not included.
if((streq(dir, "cmd/cov") || streq(dir, "cmd/prof")) && !isdir(bstr(&path))) {
if(vflag > 1)
- xprintf("skipping %s - does not exist\n", dir);
+ errprintf("skipping %s - does not exist\n", dir);
goto out;
}
@@ -583,12 +607,13 @@ install(char *dir)
xgetenv(&b, "CC");
if(b.len == 0)
bprintf(&b, "gcc");
+ clang = contains(bstr(&b), "clang");
splitfields(&gccargs, bstr(&b));
for(i=0; i<nelem(proto_gccargs); i++)
vadd(&gccargs, proto_gccargs[i]);
- if(xstrstr(bstr(&b), "clang") != nil) {
- vadd(&gccargs, "-Wno-dangling-else");
- vadd(&gccargs, "-Wno-unused-value");
+ if(clang) {
+ // clang is too smart about unused command-line arguments
+ vadd(&gccargs, "-Qunused-arguments");
}
}
@@ -605,7 +630,10 @@ install(char *dir)
if(islib) {
// C library.
vadd(&link, "ar");
- vadd(&link, "rsc");
+ if(streq(gohostos, "plan9"))
+ vadd(&link, "rc");
+ else
+ vadd(&link, "rsc");
prefix = "";
if(!hasprefix(name, "lib"))
prefix = "lib";
@@ -631,14 +659,21 @@ install(char *dir)
vadd(&link, bpathf(&b, "%s/%s%s", tooldir, elem, exe));
} else {
// C command. Use gccargs.
- vcopy(&link, gccargs.p, gccargs.len);
- vadd(&link, "-o");
- targ = link.len;
- vadd(&link, bpathf(&b, "%s/%s%s", tooldir, name, exe));
- if(streq(gohostarch, "amd64"))
- vadd(&link, "-m64");
- else if(streq(gohostarch, "386"))
- vadd(&link, "-m32");
+ if(streq(gohostos, "plan9")) {
+ vadd(&link, bprintf(&b, "%sl", gohostchar));
+ vadd(&link, "-o");
+ targ = link.len;
+ vadd(&link, bpathf(&b, "%s/%s", tooldir, name));
+ } else {
+ vcopy(&link, gccargs.p, gccargs.len);
+ vadd(&link, "-o");
+ targ = link.len;
+ vadd(&link, bpathf(&b, "%s/%s%s", tooldir, name, exe));
+ if(streq(gohostarch, "amd64"))
+ vadd(&link, "-m64");
+ else if(streq(gohostarch, "386"))
+ vadd(&link, "-m32");
+ }
}
ttarg = mtime(link.p[targ]);
@@ -672,6 +707,8 @@ install(char *dir)
bsubst(&b1, "$GOARCH", goarch);
p = bstr(&b1);
if(hassuffix(p, ".a")) {
+ if(streq(gohostos, "plan9") && hassuffix(p, "libbio.a"))
+ continue;
vadd(&lib, bpathf(&b, "%s", p));
continue;
}
@@ -741,6 +778,10 @@ install(char *dir)
}
files.len = n;
+ // If there are no files to compile, we're done.
+ if(files.len == 0)
+ goto out;
+
for(i=0; i<lib.len && !stale; i++)
if(mtime(lib.p[i]) > ttarg)
stale = 1;
@@ -767,7 +808,7 @@ install(char *dir)
for(j=0; j<nelem(gentab); j++) {
if(hasprefix(elem, gentab[j].nameprefix)) {
if(vflag > 1)
- xprintf("generate %s\n", p);
+ errprintf("generate %s\n", p);
gentab[j].gen(bstr(&path), p);
// Do not add generated file to clean list.
// In pkg/runtime, we want to be able to
@@ -799,10 +840,10 @@ install(char *dir)
p = files.p[i];
if(!hassuffix(p, ".goc"))
continue;
- // b = path/zp but with _goarch.c instead of .goc
+ // b = path/zp but with _goos_goarch.c instead of .goc
bprintf(&b, "%s%sz%s", bstr(&path), slash, lastelem(p));
b.len -= 4;
- bwritef(&b, "_%s.c", goarch);
+ bwritef(&b, "_%s_%s.c", goos, goarch);
goc2c(p, bstr(&b));
vadd(&files, bstr(&b));
}
@@ -812,10 +853,24 @@ install(char *dir)
if((!streq(goos, gohostos) || !streq(goarch, gohostarch)) && isgo) {
// We've generated the right files; the go command can do the build.
if(vflag > 1)
- xprintf("skip build for cross-compile %s\n", dir);
+ errprintf("skip build for cross-compile %s\n", dir);
goto nobuild;
}
+ // The files generated by GNU Bison use macros that aren't
+ // supported by the Plan 9 compilers so we have to use the
+ // external preprocessor when compiling.
+ usecpp = 0;
+ if(streq(gohostos, "plan9")) {
+ for(i=0; i<files.len; i++) {
+ p = files.p[i];
+ if(hassuffix(p, "y.tab.c") || hassuffix(p, "y.tab.h")){
+ usecpp = 1;
+ break;
+ }
+ }
+ }
+
// Compile the files.
for(i=0; i<files.len; i++) {
if(!hassuffix(files.p[i], ".c") && !hassuffix(files.p[i], ".s"))
@@ -825,35 +880,53 @@ install(char *dir)
vreset(&compile);
if(!isgo) {
// C library or tool.
- vcopy(&compile, gccargs.p, gccargs.len);
- vadd(&compile, "-c");
- if(streq(gohostarch, "amd64"))
- vadd(&compile, "-m64");
- else if(streq(gohostarch, "386"))
- vadd(&compile, "-m32");
- if(streq(dir, "lib9"))
- vadd(&compile, "-DPLAN9PORT");
-
- vadd(&compile, "-I");
- vadd(&compile, bpathf(&b, "%s/include", goroot));
+ if(streq(gohostos, "plan9")) {
+ vadd(&compile, bprintf(&b, "%sc", gohostchar));
+ vadd(&compile, "-FTVw");
+ if(usecpp)
+ vadd(&compile, "-Bp+");
+ vadd(&compile, bpathf(&b, "-I%s/include/plan9", goroot));
+ vadd(&compile, bpathf(&b, "-I%s/include/plan9/%s", goroot, gohostarch));
+ } else {
+ vcopy(&compile, gccargs.p, gccargs.len);
+ vadd(&compile, "-c");
+ if(streq(gohostarch, "amd64"))
+ vadd(&compile, "-m64");
+ else if(streq(gohostarch, "386"))
+ vadd(&compile, "-m32");
+ if(streq(dir, "lib9"))
+ vadd(&compile, "-DPLAN9PORT");
+
+ vadd(&compile, "-I");
+ vadd(&compile, bpathf(&b, "%s/include", goroot));
+ }
vadd(&compile, "-I");
vadd(&compile, bstr(&path));
// lib9/goos.c gets the default constants hard-coded.
if(streq(name, "goos.c")) {
- vadd(&compile, bprintf(&b, "-DGOOS=\"%s\"", goos));
- vadd(&compile, bprintf(&b, "-DGOARCH=\"%s\"", goarch));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b, "GOOS=\"%s\"", goos));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b, "GOARCH=\"%s\"", goarch));
bprintf(&b1, "%s", goroot_final);
bsubst(&b1, "\\", "\\\\"); // turn into C string
- vadd(&compile, bprintf(&b, "-DGOROOT=\"%s\"", bstr(&b1)));
- vadd(&compile, bprintf(&b, "-DGOVERSION=\"%s\"", goversion));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b, "GOROOT=\"%s\"", bstr(&b1)));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b, "GOVERSION=\"%s\"", goversion));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b, "GOARM=\"%s\"", goarm));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b, "GO386=\"%s\"", go386));
}
// gc/lex.c records the GOEXPERIMENT setting used during the build.
if(streq(name, "lex.c")) {
xgetenv(&b, "GOEXPERIMENT");
- vadd(&compile, bprintf(&b1, "-DGOEXPERIMENT=\"%s\"", bstr(&b)));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b1, "GOEXPERIMENT=\"%s\"", bstr(&b)));
}
} else {
// Supporting files for a Go package.
@@ -861,12 +934,16 @@ install(char *dir)
vadd(&compile, bpathf(&b, "%s/%sa", tooldir, gochar));
else {
vadd(&compile, bpathf(&b, "%s/%sc", tooldir, gochar));
- vadd(&compile, "-FVw");
+ vadd(&compile, "-F");
+ vadd(&compile, "-V");
+ vadd(&compile, "-w");
}
vadd(&compile, "-I");
vadd(&compile, workdir);
- vadd(&compile, bprintf(&b, "-DGOOS_%s", goos));
- vadd(&compile, bprintf(&b, "-DGOARCH_%s", goarch));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b, "GOOS_%s", goos));
+ vadd(&compile, "-D");
+ vadd(&compile, bprintf(&b, "GOARCH_%s", goarch));
}
bpathf(&b, "%s/%s", workdir, lastelem(files.p[i]));
@@ -882,7 +959,11 @@ install(char *dir)
doclean = 0;
}
- b.p[b.len-1] = 'o'; // was c or s
+ // Change the last character of the output file (which was c or s).
+ if(streq(gohostos, "plan9"))
+ b.p[b.len-1] = gohostchar[0];
+ else
+ b.p[b.len-1] = 'o';
vadd(&compile, "-o");
vadd(&compile, bstr(&b));
vadd(&compile, files.p[i]);
@@ -923,7 +1004,8 @@ install(char *dir)
if(!islib && !isgo) {
// C binaries need the libraries explicitly, and -lm.
vcopy(&link, lib.p, lib.len);
- vadd(&link, "-lm");
+ if(!streq(gohostos, "plan9"))
+ vadd(&link, "-lm");
}
// Remove target before writing it.
@@ -981,6 +1063,20 @@ shouldbuild(char *file, char *dir)
Buf b;
Vec lines, fields;
+ // On Plan 9, most of the libraries are already present.
+ // The main exception is libmach which has been modified
+ // in various places to support Go object files.
+ if(streq(gohostos, "plan9")) {
+ if(streq(dir, "lib9")) {
+ name = lastelem(file);
+ if(streq(name, "goos.c") || streq(name, "flag.c"))
+ return 1;
+ return 0;
+ }
+ if(streq(dir, "libbio"))
+ return 0;
+ }
+
// Check file name for GOOS or GOARCH.
name = lastelem(file);
for(i=0; i<nelem(okgoos); i++)
@@ -1057,7 +1153,7 @@ copy(char *dst, char *src, int exec)
Buf b;
if(vflag > 1)
- xprintf("cp %s %s\n", src, dst);
+ errprintf("cp %s %s\n", src, dst);
binit(&b);
readfile(&b, src);
@@ -1125,6 +1221,7 @@ static char *buildorder[] = {
"pkg/go/ast",
"pkg/go/parser",
"pkg/os/exec",
+ "pkg/os/signal",
"pkg/net/url",
"pkg/text/template/parse",
"pkg/text/template",
@@ -1294,6 +1391,9 @@ cmdenv(int argc, char **argv)
format = "%s=\"%s\"\n";
pflag = 0;
ARGBEGIN{
+ case '9':
+ format = "%s='%s'\n";
+ break;
case 'p':
pflag = 1;
break;
@@ -1301,7 +1401,7 @@ cmdenv(int argc, char **argv)
vflag++;
break;
case 'w':
- format = "set %s=%s\n";
+ format = "set %s=%s\r\n";
break;
default:
usage();
@@ -1318,6 +1418,10 @@ cmdenv(int argc, char **argv)
xprintf(format, "GOHOSTOS", gohostos);
xprintf(format, "GOTOOLDIR", tooldir);
xprintf(format, "GOCHAR", gochar);
+ if(streq(goarch, "arm"))
+ xprintf(format, "GOARM", goarm);
+ if(streq(goarch, "386"))
+ xprintf(format, "GO386", go386);
if(pflag) {
sep = ":";
@@ -1511,7 +1615,7 @@ cmdbanner(int argc, char **argv)
"Read and run ./sudo.bash to install the debuggers.\n");
}
- if(!streq(goroot_final, goroot)) {
+ if(!xsamefile(goroot_final, goroot)) {
xprintf("\n"
"The binaries expect %s to be copied or moved to %s\n",
goroot, goroot_final);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 18:14:09 +0000