code review 132600043: runtime: use new #include "textflag.h"

runtime: use new #include "textflag.h"

I did this just to clean things up, but it will be important
when we drop the pkg directory later.

[rsc, 2014-09-05 01:58:56]

Hello r@golang.org (cc: golang-codereviews@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go/

[bradfitz, 2014-09-05 02:03:36]

LGTM

Nice.



On Thu, Sep 4, 2014 at 6:58 PM, <rsc@golang.org> wrote:

> Reviewers: r,
>
> Message:
> Hello r@golang.org (cc: golang-codereviews@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go/
>
>
> Description:
> runtime: use new #include "textflag.h"
>
> I did this just to clean things up, but it will be important
> when we drop the pkg directory later.
>
> Please review this at https://codereview.appspot.com/132600043/
>
> Affected files (+39, -39 lines):
>   M src/pkg/runtime/atomic_386.c
>   M src/pkg/runtime/atomic_amd64x.c
>   M src/pkg/runtime/heapdump.c
>   M src/pkg/runtime/malloc.c
>   M src/pkg/runtime/mem_darwin.c
>   M src/pkg/runtime/mem_linux.c
>   M src/pkg/runtime/mem_nacl.c
>   M src/pkg/runtime/mem_netbsd.c
>   M src/pkg/runtime/mem_openbsd.c
>   M src/pkg/runtime/mem_plan9.c
>   M src/pkg/runtime/mem_solaris.c
>   M src/pkg/runtime/mem_windows.c
>   M src/pkg/runtime/mgc0.c
>   M src/pkg/runtime/msize.c
>   M src/pkg/runtime/os_darwin.c
>   M src/pkg/runtime/os_dragonfly.c
>   M src/pkg/runtime/os_freebsd.c
>   M src/pkg/runtime/os_freebsd_arm.c
>   M src/pkg/runtime/os_linux.c
>   M src/pkg/runtime/os_linux_386.c
>   M src/pkg/runtime/os_linux_arm.c
>   M src/pkg/runtime/os_nacl.c
>   M src/pkg/runtime/os_nacl_arm.c
>   M src/pkg/runtime/os_netbsd.c
>   M src/pkg/runtime/os_netbsd_arm.c
>   M src/pkg/runtime/os_openbsd.c
>   M src/pkg/runtime/os_plan9.c
>   M src/pkg/runtime/os_solaris.c
>   M src/pkg/runtime/os_windows.c
>   M src/pkg/runtime/panic.c
>   M src/pkg/runtime/proc.c
>   M src/pkg/runtime/race.c
>   M src/pkg/runtime/runtime.c
>   M src/pkg/runtime/softfloat_arm.c
>   M src/pkg/runtime/stack.c
>   M src/pkg/runtime/string.c
>   M src/pkg/runtime/stubs.goc
>   M src/pkg/runtime/syscall_solaris.goc
>   M src/pkg/runtime/vlrt.c
>
>
> Index: src/pkg/runtime/atomic_386.c
> ===================================================================
> --- a/src/pkg/runtime/atomic_386.c
> +++ b/src/pkg/runtime/atomic_386.c
> @@ -3,7 +3,7 @@
>  // license that can be found in the LICENSE file.
>
>  #include "runtime.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #pragma textflag NOSPLIT
>  uint32
> Index: src/pkg/runtime/atomic_amd64x.c
> ===================================================================
> --- a/src/pkg/runtime/atomic_amd64x.c
> +++ b/src/pkg/runtime/atomic_amd64x.c
> @@ -5,7 +5,7 @@
>  // +build amd64 amd64p32
>
>  #include "runtime.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #pragma textflag NOSPLIT
>  uint32
> Index: src/pkg/runtime/heapdump.c
> ===================================================================
> --- a/src/pkg/runtime/heapdump.c
> +++ b/src/pkg/runtime/heapdump.c
> @@ -17,7 +17,7 @@
>  #include "typekind.h"
>  #include "funcdata.h"
>  #include "zaexperiment.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  extern byte runtime·data[];
>  extern byte runtime·edata[];
> Index: src/pkg/runtime/malloc.c
> ===================================================================
> --- a/src/pkg/runtime/malloc.c
> +++ b/src/pkg/runtime/malloc.c
> @@ -13,7 +13,7 @@
>  #include "typekind.h"
>  #include "race.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  // Mark mheap as 'no pointers', it does not contain interesting pointers
> but occupies ~45K.
>  #pragma dataflag NOPTR
> Index: src/pkg/runtime/mem_darwin.c
> ===================================================================
> --- a/src/pkg/runtime/mem_darwin.c
> +++ b/src/pkg/runtime/mem_darwin.c
> @@ -7,7 +7,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #pragma textflag NOSPLIT
>  void*
> Index: src/pkg/runtime/mem_linux.c
> ===================================================================
> --- a/src/pkg/runtime/mem_linux.c
> +++ b/src/pkg/runtime/mem_linux.c
> @@ -7,7 +7,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum
>  {
> Index: src/pkg/runtime/mem_nacl.c
> ===================================================================
> --- a/src/pkg/runtime/mem_nacl.c
> +++ b/src/pkg/runtime/mem_nacl.c
> @@ -7,7 +7,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum
>  {
> Index: src/pkg/runtime/mem_netbsd.c
> ===================================================================
> --- a/src/pkg/runtime/mem_netbsd.c
> +++ b/src/pkg/runtime/mem_netbsd.c
> @@ -7,7 +7,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum
>  {
> Index: src/pkg/runtime/mem_openbsd.c
> ===================================================================
> --- a/src/pkg/runtime/mem_openbsd.c
> +++ b/src/pkg/runtime/mem_openbsd.c
> @@ -7,7 +7,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum
>  {
> Index: src/pkg/runtime/mem_plan9.c
> ===================================================================
> --- a/src/pkg/runtime/mem_plan9.c
> +++ b/src/pkg/runtime/mem_plan9.c
> @@ -7,7 +7,7 @@
>  #include "arch_GOARCH.h"
>  #include "malloc.h"
>  #include "os_GOOS.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  extern byte runtime·end[];
>  static byte *bloc = { runtime·end };
> Index: src/pkg/runtime/mem_solaris.c
> ===================================================================
> --- a/src/pkg/runtime/mem_solaris.c
> +++ b/src/pkg/runtime/mem_solaris.c
> @@ -7,7 +7,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum
>  {
> Index: src/pkg/runtime/mem_windows.c
> ===================================================================
> --- a/src/pkg/runtime/mem_windows.c
> +++ b/src/pkg/runtime/mem_windows.c
> @@ -7,7 +7,7 @@
>  #include "os_GOOS.h"
>  #include "defs_GOOS_GOARCH.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum {
>         MEM_COMMIT = 0x1000,
> Index: src/pkg/runtime/mgc0.c
> ===================================================================
> --- a/src/pkg/runtime/mgc0.c
> +++ b/src/pkg/runtime/mgc0.c
> @@ -60,7 +60,7 @@
>  #include "type.h"
>  #include "typekind.h"
>  #include "funcdata.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum {
>         Debug           = 0,
> Index: src/pkg/runtime/msize.c
> ===================================================================
> --- a/src/pkg/runtime/msize.c
> +++ b/src/pkg/runtime/msize.c
> @@ -28,7 +28,7 @@
>  #include "runtime.h"
>  #include "arch_GOARCH.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #pragma dataflag NOPTR
>  int32 runtime·class_to_size[NumSizeClasses];
> Index: src/pkg/runtime/os_darwin.c
> ===================================================================
> --- a/src/pkg/runtime/os_darwin.c
> +++ b/src/pkg/runtime/os_darwin.c
> @@ -7,7 +7,7 @@
>  #include "os_GOOS.h"
>  #include "signal_unix.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  extern SigTab runtime·sigtab[];
>
> Index: src/pkg/runtime/os_dragonfly.c
> ===================================================================
> --- a/src/pkg/runtime/os_dragonfly.c
> +++ b/src/pkg/runtime/os_dragonfly.c
> @@ -7,7 +7,7 @@
>  #include "os_GOOS.h"
>  #include "signal_unix.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  extern SigTab runtime·sigtab[];
>  extern int32 runtime·sys_umtx_sleep(uint32*, int32, int32);
> Index: src/pkg/runtime/os_freebsd.c
> ===================================================================
> --- a/src/pkg/runtime/os_freebsd.c
> +++ b/src/pkg/runtime/os_freebsd.c
> @@ -7,7 +7,7 @@
>  #include "os_GOOS.h"
>  #include "signal_unix.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  extern SigTab runtime·sigtab[];
>  extern int32 runtime·sys_umtx_op(uint32*, int32, uint32, void*, void*);
> Index: src/pkg/runtime/os_freebsd_arm.c
> ===================================================================
> --- a/src/pkg/runtime/os_freebsd_arm.c
> +++ b/src/pkg/runtime/os_freebsd_arm.c
> @@ -5,7 +5,7 @@
>  #include "runtime.h"
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  void
>  runtime·checkgoarm(void)
> Index: src/pkg/runtime/os_linux.c
> ===================================================================
> --- a/src/pkg/runtime/os_linux.c
> +++ b/src/pkg/runtime/os_linux.c
> @@ -7,7 +7,7 @@
>  #include "os_GOOS.h"
>  #include "signal_unix.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  extern SigTab runtime·sigtab[];
>
> Index: src/pkg/runtime/os_linux_386.c
> ===================================================================
> --- a/src/pkg/runtime/os_linux_386.c
> +++ b/src/pkg/runtime/os_linux_386.c
> @@ -5,7 +5,7 @@
>  #include "runtime.h"
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #define AT_NULL                0
>  #define AT_RANDOM      25
> Index: src/pkg/runtime/os_linux_arm.c
> ===================================================================
> --- a/src/pkg/runtime/os_linux_arm.c
> +++ b/src/pkg/runtime/os_linux_arm.c
> @@ -5,7 +5,7 @@
>  #include "runtime.h"
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #define AT_NULL                0
>  #define AT_PLATFORM    15 // introduced in at least 2.6.11
> Index: src/pkg/runtime/os_nacl.c
> ===================================================================
> --- a/src/pkg/runtime/os_nacl.c
> +++ b/src/pkg/runtime/os_nacl.c
> @@ -6,7 +6,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "arch_GOARCH.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>  #include "stack.h"
>
>  int8 *goos = "nacl";
> Index: src/pkg/runtime/os_nacl_arm.c
> ===================================================================
> --- a/src/pkg/runtime/os_nacl_arm.c
> +++ b/src/pkg/runtime/os_nacl_arm.c
> @@ -5,7 +5,7 @@
>  #include "runtime.h"
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  void
>  runtime·checkgoarm(void)
> Index: src/pkg/runtime/os_netbsd.c
> ===================================================================
> --- a/src/pkg/runtime/os_netbsd.c
> +++ b/src/pkg/runtime/os_netbsd.c
> @@ -7,7 +7,7 @@
>  #include "os_GOOS.h"
>  #include "signal_unix.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum
>  {
> Index: src/pkg/runtime/os_netbsd_arm.c
> ===================================================================
> --- a/src/pkg/runtime/os_netbsd_arm.c
> +++ b/src/pkg/runtime/os_netbsd_arm.c
> @@ -6,7 +6,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "signal_GOOS_GOARCH.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  void
>  runtime·lwp_mcontext_init(McontextT *mc, void *stack, M *mp, G *gp, void
> (*fn)(void))
> Index: src/pkg/runtime/os_openbsd.c
> ===================================================================
> --- a/src/pkg/runtime/os_openbsd.c
> +++ b/src/pkg/runtime/os_openbsd.c
> @@ -7,7 +7,7 @@
>  #include "os_GOOS.h"
>  #include "signal_unix.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum
>  {
> Index: src/pkg/runtime/os_plan9.c
> ===================================================================
> --- a/src/pkg/runtime/os_plan9.c
> +++ b/src/pkg/runtime/os_plan9.c
> @@ -5,7 +5,7 @@
>  #include "runtime.h"
>  #include "os_GOOS.h"
>  #include "arch_GOARCH.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  int8 *goos = "plan9";
>  extern SigTab runtime·sigtab[];
> Index: src/pkg/runtime/os_solaris.c
> ===================================================================
> --- a/src/pkg/runtime/os_solaris.c
> +++ b/src/pkg/runtime/os_solaris.c
> @@ -7,7 +7,7 @@
>  #include "os_GOOS.h"
>  #include "signal_unix.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #pragma dynexport runtime·end _end
>  #pragma dynexport runtime·etext _etext
> Index: src/pkg/runtime/os_windows.c
> ===================================================================
> --- a/src/pkg/runtime/os_windows.c
> +++ b/src/pkg/runtime/os_windows.c
> @@ -6,7 +6,7 @@
>  #include "type.h"
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #pragma dynimport runtime·AddVectoredExceptionHandler
> AddVectoredExceptionHandler "kernel32.dll"
>  #pragma dynimport runtime·CloseHandle CloseHandle "kernel32.dll"
> Index: src/pkg/runtime/panic.c
> ===================================================================
> --- a/src/pkg/runtime/panic.c
> +++ b/src/pkg/runtime/panic.c
> @@ -6,7 +6,7 @@
>  #include "arch_GOARCH.h"
>  #include "stack.h"
>  #include "malloc.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  // Code related to defer, panic and recover.
>
> Index: src/pkg/runtime/proc.c
> ===================================================================
> --- a/src/pkg/runtime/proc.c
> +++ b/src/pkg/runtime/proc.c
> @@ -10,7 +10,7 @@
>  #include "race.h"
>  #include "type.h"
>  #include "mgc0.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  // Goroutine scheduler
>  // The scheduler's job is to distribute ready-to-run goroutines over
> worker threads.
> Index: src/pkg/runtime/race.c
> ===================================================================
> --- a/src/pkg/runtime/race.c
> +++ b/src/pkg/runtime/race.c
> @@ -11,7 +11,7 @@
>  #include "race.h"
>  #include "type.h"
>  #include "typekind.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  // Race runtime functions called via runtime·racecall.
>  void __tsan_init(void);
> Index: src/pkg/runtime/runtime.c
> ===================================================================
> --- a/src/pkg/runtime/runtime.c
> +++ b/src/pkg/runtime/runtime.c
> @@ -5,7 +5,7 @@
>  #include "runtime.h"
>  #include "stack.h"
>  #include "arch_GOARCH.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  // Keep a cached value to make gotraceback fast,
>  // since we call it on every call to gentraceback.
> Index: src/pkg/runtime/softfloat_arm.c
> ===================================================================
> --- a/src/pkg/runtime/softfloat_arm.c
> +++ b/src/pkg/runtime/softfloat_arm.c
> @@ -7,7 +7,7 @@
>  // It uses true little-endian doubles, while the 7500 used mixed-endian.
>
>  #include "runtime.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #define CPSR 14
>  #define FLAGS_N (1U << 31)
> Index: src/pkg/runtime/stack.c
> ===================================================================
> --- a/src/pkg/runtime/stack.c
> +++ b/src/pkg/runtime/stack.c
> @@ -11,7 +11,7 @@
>  #include "type.h"
>  #include "race.h"
>  #include "mgc0.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  enum
>  {
> Index: src/pkg/runtime/string.c
> ===================================================================
> --- a/src/pkg/runtime/string.c
> +++ b/src/pkg/runtime/string.c
> @@ -6,7 +6,7 @@
>  #include "arch_GOARCH.h"
>  #include "malloc.h"
>  #include "race.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  String runtime·emptystring;
>
> Index: src/pkg/runtime/stubs.goc
> ===================================================================
> --- a/src/pkg/runtime/stubs.goc
> +++ b/src/pkg/runtime/stubs.goc
> @@ -7,7 +7,7 @@
>  #include "arch_GOARCH.h"
>  #include "malloc.h"
>  #include "stack.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  // This file contains functions called by Go but written
>  // in C.  These functions are problematic for the garbage
> Index: src/pkg/runtime/syscall_solaris.goc
> ===================================================================
> --- a/src/pkg/runtime/syscall_solaris.goc
> +++ b/src/pkg/runtime/syscall_solaris.goc
> @@ -7,7 +7,7 @@
>  #include "defs_GOOS_GOARCH.h"
>  #include "os_GOOS.h"
>  #include "cgocall.h"
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  #pragma dynimport libc·chdir chdir "libc.so"
>  #pragma dynimport libc·chroot chroot "libc.so"
> Index: src/pkg/runtime/vlrt.c
> ===================================================================
> --- a/src/pkg/runtime/vlrt.c
> +++ b/src/pkg/runtime/vlrt.c
> @@ -25,7 +25,7 @@
>
>  // +build arm 386
>
> -#include "../../cmd/ld/textflag.h"
> +#include "textflag.h"
>
>  /*
>   * C runtime for 64-bit divide, others.
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

[rsc, 2014-09-05 03:05:27]

*** Submitted as https://code.google.com/p/go/source/detail?r=1d866fb90d84 ***

runtime: use new #include "textflag.h"

I did this just to clean things up, but it will be important
when we drop the pkg directory later.

LGTM=bradfitz
R=r, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/132600043