[dev.power64] code review 160200044: build: merge default into dev.power64

src/pkg/runtime/os_linux_arm.c

 // Copyright 2009 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.
 
 #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
 #define AT_HWCAP        16 // introduced in at least 2.6.11
 #define AT_RANDOM       25 // introduced in 2.6.29
 #define HWCAP_VFP       (1 << 6) // introduced in at least 2.6.11
 #define HWCAP_VFPv3     (1 << 13) // introduced in 2.6.30
 static uint32 runtime·randomNumber;
 uint8  runtime·armArch = 6;     // we default to ARMv6
 uint32 runtime·hwcap;   // set by setup_auxv
@@ skipping 52 matching lines @@
 
 #pragma textflag NOSPLIT
 int64
 runtime·cputicks(void)
 {
         // Currently cputicks() is used in blocking profiler and to seed runtime·fastrand1().
         // runtime·nanotime() is a poor approximation of CPU ticks that is enough for the profiler.
         // runtime·randomNumber provides better seeding of fastrand1.
         return runtime·nanotime() + runtime·randomNumber;
 }