History

tools headers: Fixup bitsperlong per arch includes

We were getting the file by luck, from one of the paths in -I, fix it to get it from the proper place: $ cd tools/include/uapi/asm/ [acme@quaco asm]$ grep include bitsperlong.h #include "../../arch/x86/include/uapi/asm/bitsperlong.h" #include "../../arch/arm64/include/uapi/asm/bitsperlong.h" #include "../../arch/powerpc/include/uapi/asm/bitsperlong.h" #include "../../arch/s390/include/uapi/asm/bitsperlong.h" #include "../../arch/sparc/include/uapi/asm/bitsperlong.h" #include "../../arch/mips/include/uapi/asm/bitsperlong.h" #include "../../arch/ia64/include/uapi/asm/bitsperlong.h" #include "../../arch/riscv/include/uapi/asm/bitsperlong.h" #include "../../arch/alpha/include/uapi/asm/bitsperlong.h" #include <asm-generic/bitsperlong.h> $ ls -la ../../arch/x86/include/uapi/asm/bitsperlong.h ls: cannot access '../../arch/x86/include/uapi/asm/bitsperlong.h': No such file or directory $ ls -la ../../../arch/*/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 237 ../../../arch/alpha/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 841 ../../../arch/arm64/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 966 ../../../arch/hexagon/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 234 ../../../arch/ia64/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 100 ../../../arch/microblaze/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 244 ../../../arch/mips/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 352 ../../../arch/parisc/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 312 ../../../arch/powerpc/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 353 ../../../arch/riscv/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 292 ../../../arch/s390/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 323 ../../../arch/sparc/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 320 ../../../arch/x86/include/uapi/asm/bitsperlong.h $ Found while fixing some other problem, before it was escaping the tools/ chroot and using stuff in the kernel sources: CC /tmp/build/perf/util/find_bit.o In file included from /git/linux/tools/include/../../arch/x86/include/uapi/asm/bitsperlong.h:11, from /git/linux/tools/include/uapi/asm/bitsperlong.h:3, from /git/linux/tools/include/linux/bits.h:6, from /git/linux/tools/include/linux/bitops.h:13, from ../lib/find_bit.c:17: # cd /git/linux/tools/include/../../arch/x86/include/uapi/asm/ # pwd /git/linux/arch/x86/include/uapi/asm # Now it is getting the one we want it to, i.e. the one inside tools/: CC /tmp/build/perf/util/find_bit.o In file included from /git/linux/tools/arch/x86/include/uapi/asm/bitsperlong.h:11, from /git/linux/tools/include/linux/bits.h:6, from /git/linux/tools/include/linux/bitops.h:13,

Arnaldo Carvalho de Melo committed 7 years ago

Commit 42fc2e91 parent 5c959b61 file · +9 −9Browse files

Unified · Split

tools/include/uapi/asm/bitsperlong.h+9−9
@@ -1,22 +1,22 @@
11 /* SPDX-License-Identifier: GPL-2.0 */
22 #if defined(__i386__) || defined(__x86_64__)
3−#include "../../arch/x86/include/uapi/asm/bitsperlong.h"
3+#include "../../../arch/x86/include/uapi/asm/bitsperlong.h"
44 #elif defined(__aarch64__)
5−#include "../../arch/arm64/include/uapi/asm/bitsperlong.h"
5+#include "../../../arch/arm64/include/uapi/asm/bitsperlong.h"
66 #elif defined(__powerpc__)
7−#include "../../arch/powerpc/include/uapi/asm/bitsperlong.h"
7+#include "../../../arch/powerpc/include/uapi/asm/bitsperlong.h"
88 #elif defined(__s390__)
9−#include "../../arch/s390/include/uapi/asm/bitsperlong.h"
9+#include "../../../arch/s390/include/uapi/asm/bitsperlong.h"
1010 #elif defined(__sparc__)
11−#include "../../arch/sparc/include/uapi/asm/bitsperlong.h"
11+#include "../../../arch/sparc/include/uapi/asm/bitsperlong.h"
1212 #elif defined(__mips__)
13−#include "../../arch/mips/include/uapi/asm/bitsperlong.h"
13+#include "../../../arch/mips/include/uapi/asm/bitsperlong.h"
1414 #elif defined(__ia64__)
15−#include "../../arch/ia64/include/uapi/asm/bitsperlong.h"
15+#include "../../../arch/ia64/include/uapi/asm/bitsperlong.h"
1616 #elif defined(__riscv)
17−#include "../../arch/riscv/include/uapi/asm/bitsperlong.h"
17+#include "../../../arch/riscv/include/uapi/asm/bitsperlong.h"
1818 #elif defined(__alpha__)
19−#include "../../arch/alpha/include/uapi/asm/bitsperlong.h"
19+#include "../../../arch/alpha/include/uapi/asm/bitsperlong.h"
2020 #else
2121 #include <asm-generic/bitsperlong.h>
2222 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t