remove nacl

The recent linker changes broke NaCl support
a month ago, and there are no known users of it.

The NaCl code can always be recovered from the
repository history.

R=adg, r
CC=golang-dev
https://golang.org/cl/3671042

Author: rsc

doc/devel/roadmap.html

@@ -89,8 +89,6 @@ <h3 id="done">Done</h3>
 <li>
 Gccgo: garbage collection.
 <li>
-Native Client (NaCl) support.
-<li>
 SWIG support.
 <li>		
 Simpler semicolon rules.

doc/install.html

@@ -62,7 +62,7 @@ <h2 id="introduction">Introduction</h2>
 </p>
 
 <p>
-The compilers can target the FreeBSD, Linux, Native Client,
+The compilers can target the FreeBSD, Linux,
 and OS X (a.k.a. Darwin) operating systems.
 (A port to Microsoft Windows is in progress but incomplete.  See the 
 <a href="http://code.google.com/p/go/wiki/WindowsPort">Windows Port</a>
@@ -340,7 +340,6 @@ <h2 id="environment">Environment variables</h2>
 	Choices for <code>$GOOS</code> are <code>linux</code>,
 	<code>freebsd</code>,
 	<code>darwin</code> (Mac OS X 10.5 or 10.6),
-	<code>nacl</code> (Native Client, an incomplete port),
 	and <code>windows</code> (Windows, an incomplete port).
 	Choices for <code>$GOARCH</code> are <code>amd64</code> (64-bit x86, the most mature port),
 	<code>386</code> (32-bit x86), and
@@ -372,9 +371,6 @@ <h2 id="environment">Environment variables</h2>
 	<td></td><td><code>linux</code></td> <td><code>arm</code></td> <td><i>incomplete</i></td>
 	</tr>
 	<tr>
-	<td></td><td><code>nacl</code></td> <td><code>386</code></td>
-	</tr>
-	<tr>
 	<td></td><td><code>windows</code></td> <td><code>386</code></td> <td><i>incomplete</i></td>
 	</tr>
 	</table>

src/Make.inc

@@ -32,12 +32,11 @@ endif
 ifeq ($(GOOS),darwin)
 else ifeq ($(GOOS),freebsd)
 else ifeq ($(GOOS),linux)
-else ifeq ($(GOOS),nacl)
 else ifeq ($(GOOS),tiny)
 else ifeq ($(GOOS),plan9)
 else ifeq ($(GOOS),windows)
 else
-$(error Invalid $$GOOS '$(GOOS)'; must be darwin, freebsd, linux, nacl, tiny, plan9, or windows)
+$(error Invalid $$GOOS '$(GOOS)'; must be darwin, freebsd, linux, plan9, tiny, or windows)
 endif
 
 ifeq ($(GOHOSTARCH),)

src/all-nacl.bash

@@ -535,8 +535,6 @@ asmb(void)
 
 		for(sect=segtext.sect; sect!=nil; sect=sect->next)
 			elfshbits(sect);
-		for(sect=segrodata.sect; sect!=nil; sect=sect->next)
-			elfshbits(sect);
 		for(sect=segdata.sect; sect!=nil; sect=sect->next)
 			elfshbits(sect);
 

src/cmd/5l/asm.c

@@ -415,7 +415,7 @@ addpltsym(Sym *s)
 static void
 addgotsym(Sym *s)
 {
-	Sym *got, *rela, *indir;
+	Sym *got, *rela;
 
 	if(s->got >= 0)
 		return;
@@ -976,8 +976,6 @@ asmb(void)
 			diag("elftextsh = %d, want %d", elftextsh, eh->shnum);
 		for(sect=segtext.sect; sect!=nil; sect=sect->next)
 			elfshbits(sect);
-		for(sect=segrodata.sect; sect!=nil; sect=sect->next)
-			elfshbits(sect);
 		for(sect=segdata.sect; sect!=nil; sect=sect->next)
 			elfshbits(sect);
 

src/cmd/6l/asm.c

@@ -8,7 +8,6 @@
 #include "opt.h"
 
 static Prog *pret;
-static Node *naclnop;
 
 void
 compile(Node *fn)
@@ -24,7 +23,6 @@ compile(Node *fn)
 		newproc = sysfunc("newproc");
 		deferproc = sysfunc("deferproc");
 		deferreturn = sysfunc("deferreturn");
-		naclnop = sysfunc("naclnop");
 		panicindex = sysfunc("panicindex");
 		panicslice = sysfunc("panicslice");
 		throwreturn = sysfunc("throwreturn");
@@ -96,16 +94,8 @@ compile(Node *fn)
 	if(pret)
 		patch(pret, pc);
 	ginit();
-	if(hasdefer) {
-		// On Native client, insert call to no-op function
-		// to force alignment immediately before call to deferreturn,
-		// so that when jmpdefer subtracts 5 from the second CALL's
-		// return address and then the return masks off the low bits,
-		// we'll back up to the NOPs immediately after the dummy CALL.
-		if(strcmp(getgoos(), "nacl") == 0)
-			ginscall(naclnop, 0);
+	if(hasdefer)
 		ginscall(deferreturn, 0);
-	}
 	if(curfn->exit)
 		genlist(curfn->exit);
 	gclean();

src/cmd/8g/ggen.c

@@ -539,8 +539,6 @@ doelf(void)
 	elfstr[ElfStrData] = addstring(shstrtab, ".data");
 	elfstr[ElfStrBss] = addstring(shstrtab, ".bss");
 	addstring(shstrtab, ".elfdata");
-	if(HEADTYPE == 8)
-		addstring(shstrtab, ".closure");
 	addstring(shstrtab, ".rodata");
 	if(!debug['s']) {
 		elfstr[ElfStrGosymcounts] = addstring(shstrtab, ".gosymcounts");
@@ -674,8 +672,6 @@ asmb(void)
 	sect = segtext.sect;
 	seek(cout, sect->vaddr - segtext.vaddr + segtext.fileoff, 0);
 	codeblk(sect->vaddr, sect->len);
-	
-	// TODO: NaCl: pad with HLT
 
 	/* output read-only data in text segment */
 	sect = segtext.sect->next;
@@ -889,7 +885,7 @@ asmb(void)
 
 	Elfput:
 		/* elf 386 */
-		if(HEADTYPE == 8 || HEADTYPE == 11)
+		if(HEADTYPE == 11)
 			debug['d'] = 1;
 
 		eh = getElfEhdr();
@@ -901,17 +897,14 @@ asmb(void)
 		/* This null SHdr must appear before all others */
 		sh = newElfShdr(elfstr[ElfStrEmpty]);
 
-		/* program header info - but not on native client */
-		pph = nil;
-		if(HEADTYPE != 8) {
-			pph = newElfPhdr();
-			pph->type = PT_PHDR;
-			pph->flags = PF_R + PF_X;
-			pph->off = eh->ehsize;
-			pph->vaddr = INITTEXT - HEADR + pph->off;
-			pph->paddr = INITTEXT - HEADR + pph->off;
-			pph->align = INITRND;
-		}
+		/* program header info */
+		pph = newElfPhdr();
+		pph->type = PT_PHDR;
+		pph->flags = PF_R + PF_X;
+		pph->off = eh->ehsize;
+		pph->vaddr = INITTEXT - HEADR + pph->off;
+		pph->paddr = INITTEXT - HEADR + pph->off;
+		pph->align = INITRND;
 
 		if(!debug['d']) {
 			/* interpreter */
@@ -935,8 +928,6 @@ asmb(void)
 		}
 
 		elfphload(&segtext);
-		if(segrodata.len > 0)
-			elfphload(&segrodata);
 		elfphload(&segdata);
 
 		/* Dynamic linking sections */
@@ -1038,8 +1029,6 @@ asmb(void)
 			diag("elftextsh = %d, want %d", elftextsh, eh->shnum);
 		for(sect=segtext.sect; sect!=nil; sect=sect->next)
 			elfshbits(sect);
-		for(sect=segrodata.sect; sect!=nil; sect=sect->next)
-			elfshbits(sect);
 		for(sect=segdata.sect; sect!=nil; sect=sect->next)
 			elfshbits(sect);
 
@@ -1073,11 +1062,6 @@ asmb(void)
 		eh->ident[EI_DATA] = ELFDATA2LSB;
 		eh->ident[EI_VERSION] = EV_CURRENT;
 		switch(HEADTYPE) {
-		case 8:
-			eh->ident[EI_OSABI] = ELFOSABI_NACL;
-			eh->ident[EI_ABIVERSION] = 7;
-			eh->flags = 0x200000;	// aligned mod 32
-			break;
 		case 9:
 			eh->ident[EI_OSABI] = 9;
 			break;

src/cmd/8l/asm.c

@@ -321,7 +321,6 @@ EXTERN	int32	spsize;
 EXTERN	Sym*	symlist;
 EXTERN	int32	symsize;
 EXTERN	Sym*	textp;
-EXTERN	int32	textpad;
 EXTERN	int32	textsize;
 EXTERN	int	version;
 EXTERN	Prog	zprg;

src/cmd/8l/l.h

@@ -55,8 +55,10 @@ char	*thestring 	= "386";
  *	-H4 -Tx -Rx			is fake MS-DOS .EXE
  *	-H6 -Tx -Rx			is Apple Mach-O
  *	-H7 -Tx -Rx			is Linux ELF32
- *	-H8 -Tx -Rx			is Google Native Client
+ *	-H8 -Tx -Rx			was Google Native Client
  *	-H9 -Tx -Rx			is FreeBSD ELF32
+ *	-H10 -Tx -Rx			is MS Windows PE
+ *	-H11 -Tx -Rx			is tiny (os image)
  */
 
 void
@@ -133,9 +135,6 @@ main(int argc, char *argv[])
 		if(strcmp(goos, "darwin") == 0)
 			HEADTYPE = 6;
 		else
-		if(strcmp(goos, "nacl") == 0)
-			HEADTYPE = 8;
-		else
 		if(strcmp(goos, "freebsd") == 0)
 			HEADTYPE = 9;
 		else
@@ -248,21 +247,6 @@ main(int argc, char *argv[])
 		if(INITRND == -1)
 			INITRND = 4096;
 		break;
-	case 8:	/* native client elf32 executable */
-		elfinit();
-		HEADR = 4096;
-		if(INITTEXT == -1)
-			INITTEXT = 0x20000;
-		if(INITDAT == -1)
-			INITDAT = 0;
-		if(INITRND == -1)
-			INITRND = 65536;
-		
-		// 512 kB of address space for closures.
-		// (Doesn't take any space in the binary file.)
-		// Closures are 64 bytes each, so this is 8,192 closures.
-		textpad = 512*1024;
-		break;
 	case 10: /* PE executable */
 		peinit();
 		HEADR = PEFILEHEADR;