qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 23:34:42 -07:00
Code Releases Activity

nacl, tiny: remove vestiges

Browse Source 
R=golang-dev, r, rsc
CC=golang-dev
https://golang.org/cl/4635053
This commit is contained in:
Robert Hencke 2011-06-21 12:02:40 -04:00 committed by Russ Cox
parent d6be71c788
commit b88e669a8f
8 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/nacl/naclrun
View File

@ -1,15 +0,0 @@
#!/bin/sh
# Copyright 2010 The Go Authors. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
# Run nacl binary in debug mode (allow file access)
# and then grep away the chatter.
# See ../../src/pkg/exp/nacl/README for more on
# how to configure NaCl.
nacl -d "$@" >/tmp/nacl.out.$$ 2>&1
status=$?
egrep -v 'DEBUG MODE ENABLED|^\[[0-9]+,' /tmp/nacl.out.$$
rm -f /tmp/nacl.out.$$
exit $status

4
src/cmd/8l/asm.c
View File

@ -920,10 +920,6 @@ asmb(void)
break; break;
Elfput: Elfput:
/* elf 386 */
if(HEADTYPE == Htiny)
debug['d'] = 1;
eh = getElfEhdr(); eh = getElfEhdr();
startva = INITTEXT - HEADR; startva = INITTEXT - HEADR;

15
src/cmd/8l/obj.c
View File

@ -54,11 +54,9 @@ Header headers[] = {
"msdosexe", Hmsdosexe, "msdosexe", Hmsdosexe,
"darwin", Hdarwin, "darwin", Hdarwin,
"linux", Hlinux, "linux", Hlinux,
"nacl", Hnacl,
"freebsd", Hfreebsd, "freebsd", Hfreebsd,
"windows", Hwindows, "windows", Hwindows,
"windowsgui", Hwindows, "windowsgui", Hwindows,
"tiny", Htiny,
0, 0 0, 0
}; };
@ -70,10 +68,8 @@ Header headers[] = {
* -Hmsdosexe -Tx -Rx is fake MS-DOS .EXE * -Hmsdosexe -Tx -Rx is fake MS-DOS .EXE
* -Hdarwin -Tx -Rx is Apple Mach-O * -Hdarwin -Tx -Rx is Apple Mach-O
* -Hlinux -Tx -Rx is Linux ELF32 * -Hlinux -Tx -Rx is Linux ELF32
* -Hnacl -Tx -Rx was Google Native Client
* -Hfreebsd -Tx -Rx is FreeBSD ELF32 * -Hfreebsd -Tx -Rx is FreeBSD ELF32
* -Hwindows -Tx -Rx is MS Windows PE32 * -Hwindows -Tx -Rx is MS Windows PE32
* -Htiny -Tx -Rx is tiny (os image)
*/ */
void void
@ -254,17 +250,6 @@ main(int argc, char *argv[])
if(INITRND == -1) if(INITRND == -1)
INITRND = PESECTALIGN; INITRND = PESECTALIGN;
break; break;
case Htiny:
tlsoffset = 0;
elfinit();
HEADR = ELFRESERVE;
if(INITTEXT == -1)
INITTEXT = 0x100000+HEADR;
if(INITDAT == -1)
INITDAT = 0;
if(INITRND == -1)
INITRND = 4096;
break;
} }
if(INITDAT != 0 && INITRND != 0) if(INITDAT != 0 && INITRND != 0)
print("warning: -D0x%ux is ignored because of -R0x%ux\n", print("warning: -D0x%ux is ignored because of -R0x%ux\n",

1
src/cmd/ld/elf.h
View File

@ -110,7 +110,6 @@ typedef struct {
#define ELFOSABI_OPENVMS 13 /* Open VMS */ #define ELFOSABI_OPENVMS 13 /* Open VMS */
#define ELFOSABI_NSK 14 /* HP Non-Stop Kernel */ #define ELFOSABI_NSK 14 /* HP Non-Stop Kernel */
#define ELFOSABI_ARM 97 /* ARM */ #define ELFOSABI_ARM 97 /* ARM */
#define ELFOSABI_NACL 123 /* Native Client */
#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ #define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */
#define ELFOSABI_SYSV ELFOSABI_NONE /* symbol used in old spec */ #define ELFOSABI_SYSV ELFOSABI_NONE /* symbol used in old spec */

2
src/cmd/ld/lib.h
View File

@ -260,10 +260,8 @@ enum {
Hipaq, // ipaq Hipaq, // ipaq
Hdarwin, // Apple Mach-O Hdarwin, // Apple Mach-O
Hlinux, // Linux ELF Hlinux, // Linux ELF
Hnacl, // Google Native Client
Hfreebsd, // FreeBSD ELF Hfreebsd, // FreeBSD ELF
Hwindows, // MS Windows PE Hwindows, // MS Windows PE
Htiny // tiny (os image)
}; };
typedef struct Header Header; typedef struct Header Header;

1
src/pkg/runtime/mkasmh.sh
View File

@ -14,7 +14,6 @@ EOF
case "$GOARCH" in case "$GOARCH" in
386) 386)
# The offsets 0 and 4 are also known to: # The offsets 0 and 4 are also known to:
# nacl/thread.c:/^newosproc
# ../../cmd/8l/pass.c:/D_GS # ../../cmd/8l/pass.c:/D_GS
# ../../libcgo/linux_386.c:/^threadentry # ../../libcgo/linux_386.c:/^threadentry
# ../../libcgo/darwin_386.c:/^threadentry # ../../libcgo/darwin_386.c:/^threadentry

5
src/pkg/syscall/mksyscall.pl
View File

@ -24,7 +24,6 @@ use strict;
my $cmdline = "mksyscall.pl " . join(' ', @ARGV); my $cmdline = "mksyscall.pl " . join(' ', @ARGV);
my $errors = 0; my $errors = 0;
my $_32bit = ""; my $_32bit = "";
my $nacl = 0;
my $plan9 = 0; my $plan9 = 0;
if($ARGV[0] eq "-b32") { if($ARGV[0] eq "-b32") {
@ -34,10 +33,6 @@ if($ARGV[0] eq "-b32") {
$_32bit = "little-endian"; $_32bit = "little-endian";
shift; shift;
} }
if($ARGV[0] eq "-nacl") {
$nacl = 1;
shift;
}
if($ARGV[0] eq "-plan9") { if($ARGV[0] eq "-plan9") {
$plan9 = 1; $plan9 = 1;
shift; shift;

6
test/run
View File

@ -23,11 +23,6 @@ Xarm)
exit 1 exit 1
esac esac
case X"$GOOS" in
Xnacl)
export E=${GORUN:-$GOROOT/misc/nacl/naclrun}
esac
export G=${A}g export G=${A}g
export L=${A}l export L=${A}l
export GOTRACEBACK=0 export GOTRACEBACK=0
@ -112,7 +107,6 @@ done | # clean up some stack noise
/^Trace\/BPT trap/d /^Trace\/BPT trap/d
/RUNFILE/ s/line 1: *[0-9]*/line 1: PID/ /RUNFILE/ s/line 1: *[0-9]*/line 1: PID/
/^\$RUNFILE: line 1: PID Trace\/breakpoint trap/d /^\$RUNFILE: line 1: PID Trace\/breakpoint trap/d
/Fault in NaCl untrusted code/d
/Segmentation fault/d /Segmentation fault/d
/^qemu: uncaught target signal 11 (Segmentation fault) - exiting/d' > run.out /^qemu: uncaught target signal 11 (Segmentation fault) - exiting/d' > run.out