Skip to content

Commit

Permalink
all: simplify the spelling of Linux
Browse files Browse the repository at this point in the history
The prefix didn't help clarify anything.

Change-Id: I897fd4022ce9df42a548b15714e4b592618ca547
Reviewed-on: https://go-review.googlesource.com/c/go/+/309573
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
  • Loading branch information
bradfitz committed Apr 13, 2021
1 parent 3e5bba0 commit 13a4e8c
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion misc/cgo/test/setgid_linux.go
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// Test that setgid does not hang on GNU/Linux.
// Test that setgid does not hang on Linux.
// See https://golang.org/issue/3871 for details.

package cgotest
Expand Down
2 changes: 1 addition & 1 deletion misc/cgo/testcarchive/carchive_test.go
Expand Up @@ -775,7 +775,7 @@ func TestSIGPROF(t *testing.T) {
// tool with -buildmode=c-archive, it passes -shared to the compiler,
// so we override that. The go tool doesn't work this way, but Bazel
// will likely do it in the future. And it ought to work. This test
// was added because at one time it did not work on PPC GNU/Linux.
// was added because at one time it did not work on PPC Linux.
func TestCompileWithoutShared(t *testing.T) {
// For simplicity, reuse the signal forwarding test.
checkSignalForwardingTest(t)
Expand Down
4 changes: 2 additions & 2 deletions src/debug/elf/elf.go
Expand Up @@ -123,8 +123,8 @@ const (
ELFOSABI_NONE OSABI = 0 /* UNIX System V ABI */
ELFOSABI_HPUX OSABI = 1 /* HP-UX operating system */
ELFOSABI_NETBSD OSABI = 2 /* NetBSD */
ELFOSABI_LINUX OSABI = 3 /* GNU/Linux */
ELFOSABI_HURD OSABI = 4 /* GNU/Hurd */
ELFOSABI_LINUX OSABI = 3 /* Linux */
ELFOSABI_HURD OSABI = 4 /* Hurd */
ELFOSABI_86OPEN OSABI = 5 /* 86Open common IA32 ABI */
ELFOSABI_SOLARIS OSABI = 6 /* Solaris */
ELFOSABI_AIX OSABI = 7 /* AIX */
Expand Down
2 changes: 1 addition & 1 deletion src/os/file_unix.go
Expand Up @@ -174,7 +174,7 @@ func newFile(fd uintptr, name string, kind newFileKind) *File {
// with the netpoll system. That can happen for
// a file descriptor that is not supported by
// epoll/kqueue; for example, disk files on
// GNU/Linux systems. We assume that any real error
// Linux systems. We assume that any real error
// will show up in later I/O.
} else if pollable {
// We successfully registered with netpoll, so put
Expand Down
4 changes: 2 additions & 2 deletions src/os/signal/doc.go
Expand Up @@ -50,7 +50,7 @@ If the Go program is started with either SIGHUP or SIGINT ignored
If the Go program is started with a non-empty signal mask, that will
generally be honored. However, some signals are explicitly unblocked:
the synchronous signals, SIGILL, SIGTRAP, SIGSTKFLT, SIGCHLD, SIGPROF,
and, on GNU/Linux, signals 32 (SIGCANCEL) and 33 (SIGSETXID)
and, on Linux, signals 32 (SIGCANCEL) and 33 (SIGSETXID)
(SIGCANCEL and SIGSETXID are used internally by glibc). Subprocesses
started by os.Exec, or by the os/exec package, will inherit the
modified signal mask.
Expand Down Expand Up @@ -176,7 +176,7 @@ will initialize signals at global constructor time. For
shared library is loaded.
If the Go runtime sees an existing signal handler for the SIGCANCEL or
SIGSETXID signals (which are used only on GNU/Linux), it will turn on
SIGSETXID signals (which are used only on Linux), it will turn on
the SA_ONSTACK flag and otherwise keep the signal handler.
For the synchronous signals and SIGPIPE, the Go runtime will install a
Expand Down
2 changes: 1 addition & 1 deletion src/os/wait_waitid.go
Expand Up @@ -23,7 +23,7 @@ const _P_PID = 1
// It does not actually call p.Wait.
func (p *Process) blockUntilWaitable() (bool, error) {
// The waitid system call expects a pointer to a siginfo_t,
// which is 128 bytes on all GNU/Linux systems.
// which is 128 bytes on all Linux systems.
// On darwin/amd64, it requires 104 bytes.
// We don't care about the values it returns.
var siginfo [16]uint64
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/cgo/gcc_sigaction.c
Expand Up @@ -23,7 +23,7 @@ typedef struct {
} go_sigaction_t;

// SA_RESTORER is part of the kernel interface.
// This is GNU/Linux i386/amd64 specific.
// This is Linux i386/amd64 specific.
#ifndef SA_RESTORER
#define SA_RESTORER 0x4000000
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/os_linux_be64.go
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// The standard GNU/Linux sigset type on big-endian 64-bit machines.
// The standard Linux sigset type on big-endian 64-bit machines.

//go:build linux && (ppc64 || s390x)
// +build linux
Expand Down

5 comments on commit 13a4e8c

@bbkane
Copy link

@bbkane bbkane commented on 13a4e8c Apr 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels like erasing history- regardless of how FSF/GNU is currently acting, they deserve credit for past achievements.

@soatok
Copy link

@soatok soatok commented on 13a4e8c Apr 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels like erasing history

Because nothing says "erasing history" like permanently recording a delete and add event in a repository's history.

@seirl
Copy link

@seirl seirl commented on 13a4e8c Apr 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels like erasing history- regardless of how FSF/GNU is currently acting, they deserve credit for past achievements.

This commit only touches code related to the kernel, specifying "GNU/Linux" is less correct than simply "Linux".

@turtlegarden
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, Hurd too?

@ianlancetaylor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use GitHub for code review. This commit is a mirror to GitHub of https://golang.org/cl/309573. Very few people will ever see this discussion, so I'm locking this.

Please sign in to comment.