diff options
| author | dim <dim@FreeBSD.org> | 2016-01-15 17:55:00 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-15 17:55:00 +0000 |
| commit | 6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe (patch) | |
| tree | 402d8f6984826f9801b169f8bc8a5dae20ed1c60 /usr.bin | |
| parent | 8e5c968a84ceadc1d422b13933e1edc45c5372ea (diff) | |
| parent | 5ac53a20e575001384d1acfb426a65ae8c309c24 (diff) | |
| download | FreeBSD-src-6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe.zip FreeBSD-src-6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe.tar.gz | |
Merge ^/head r293850 through r294089.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/clang/clang/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/clang/lldb/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/numactl/numactl.c | 11 |
3 files changed, 13 insertions, 5 deletions
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index e28ba9d..3665888 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -11,6 +11,10 @@ SRCS= cc1_main.cpp \ .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= yes + +.if ${MACHINE_CPUARCH} == "arm" +CFLAGS+= -mlong-calls +.endif .endif LINKS= ${BINDIR}/clang ${BINDIR}/clang++ \ diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index ff5e050..b2c9050 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -8,6 +8,9 @@ LLDB_SRCS=${.CURDIR}/../../../contrib/llvm/tools/lldb CFLAGS+= -I${LLDB_SRCS}/include CXXFLAGS+= -std=c++11 +.if ${MACHINE_CPUARCH} == "arm" +CFLAGS+= -mlong-calls +.endif SRCDIR= tools/lldb/tools/driver SRCS= Driver.cpp \ diff --git a/usr.bin/numactl/numactl.c b/usr.bin/numactl/numactl.c index ce1dfae..8ad0d007 100644 --- a/usr.bin/numactl/numactl.c +++ b/usr.bin/numactl/numactl.c @@ -133,7 +133,7 @@ usage(void) } static int -set_numa_domain_cpuaffinity(int cpu_domain) +set_numa_domain_cpuaffinity(int cpu_domain, cpuwhich_t which, id_t id) { cpuset_t set; int error; @@ -142,8 +142,8 @@ set_numa_domain_cpuaffinity(int cpu_domain) cpu_domain, sizeof(set), &set); if (error != 0) err(1, "cpuset_getaffinity"); - error = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, - sizeof(set), &set); + error = cpuset_setaffinity(CPU_LEVEL_WHICH, which, id, sizeof(set), + &set); if (error != 0) err(1, "cpuset_setaffinity"); @@ -228,7 +228,8 @@ main(int argc, char *argv[]) /* If a CPU domain policy was given, include that too */ if (cpu_domain != -1) - (void) set_numa_domain_cpuaffinity(cpu_domain); + (void) set_numa_domain_cpuaffinity(cpu_domain, + CPU_WHICH_PID, -1); errno = 0; execvp(*argv, argv); @@ -278,7 +279,7 @@ main(int argc, char *argv[]) /* If a CPU domain policy was given, include that too */ if (cpu_domain != -1) - (void) set_numa_domain_cpuaffinity(cpu_domain); + (void) set_numa_domain_cpuaffinity(cpu_domain, which, id); exit(0); } |
