mirror of
https://github.com/torvalds/linux
synced 2024-07-21 10:41:44 +00:00
linux_kselftest-next-6.10-rc1-fixes
This kselftest fixes update for Linux 6.10-rc1 consists of reverts framework change to add D_GNU_SOURCE to KHDR_INCLUDES to Makefile, lib.mk, and kselftest_harness.h and follow-on changes to cgroup and sgx test as they are causing build failures and warnings. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPZKym/RZuOCGeA/kCwJExA0NQxwFAmZLb3sACgkQCwJExA0N QxweSQ//WiDfJtObms7pDos6Q5DBnq2seGgK3+JUcAbBhNETPLzYBHSnvVnixRmi +QccdtTlPYE98vAk7GCt9zuBr82SV1z9VaNHVst+4jZeaSkmNFHGMS/ZSEE1x79g z4qL1C1eA0qPzmW17vgUv08+Lm5WKxt4RIsZEYWBi7tnu+MbfcaPaTbGZ85o/tG0 IVZluGfVVaci7CQnpYhRD4hsJOWUC2H/YrvCNpjm6rGUFu+4Jm7rvHJPO+Ef6yCT tjKc5wReHRR2xT2+i4FoFjGqrAMsM/xakdiVpQWUlHUSm5/Nboqw7B73eNm/N2YL KvoJKBCuUPjmPKsoDGyUSORyx7j5RJnmdbGbFISOnZGpDVDkwSJVQDPJKeW9WqfS ONYVRRyjdift7BVcbFIpnde6TD7lCCv8sYrr2SpZv1wHybhMmrL0ojoTOOO93Xcd agpHGHjIOqmn+EGmptYeFEKKHr/GX+r6cQK0csmNhuSajHxeohwpzzs/v9gUisQ0 BB5dC2Mo7wj1CES8DYKucFSSyCmZruzpyKtEz7Ndj1SAYzZqqYQV41kMDdlGYDE4 qsHNVpA5DOFLOV8wOX59XjSu+UnJDjFyluWSaj66lJ1gA9qpYEifWD0l851LZ1YG hcCTd90Hbuh9XlOPmQEciVF98tJFrO0ho6vQu41jgjLPvJ4Y8H8= =Qisj -----END PGP SIGNATURE----- Merge tag 'linux_kselftest-next-6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest Pull kselftest fixes from Shuah Khan: "Revert framework change to add D_GNU_SOURCE to KHDR_INCLUDES to Makefile, lib.mk, and kselftest_harness.h and follow-on changes to cgroup and sgx test as they are causing build failures and warnings" * tag 'linux_kselftest-next-6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: Revert "selftests/cgroup: Drop define _GNU_SOURCE" Revert "selftests/sgx: Include KHDR_INCLUDES in Makefile" Revert "selftests: Compile kselftest headers with -D_GNU_SOURCE"
This commit is contained in:
commit
70ec81c2e2
|
@ -170,11 +170,11 @@ ifneq ($(KBUILD_OUTPUT),)
|
||||||
# $(realpath ...) resolves symlinks
|
# $(realpath ...) resolves symlinks
|
||||||
abs_objtree := $(realpath $(abs_objtree))
|
abs_objtree := $(realpath $(abs_objtree))
|
||||||
BUILD := $(abs_objtree)/kselftest
|
BUILD := $(abs_objtree)/kselftest
|
||||||
KHDR_INCLUDES := -D_GNU_SOURCE -isystem ${abs_objtree}/usr/include
|
KHDR_INCLUDES := -isystem ${abs_objtree}/usr/include
|
||||||
else
|
else
|
||||||
BUILD := $(CURDIR)
|
BUILD := $(CURDIR)
|
||||||
abs_srctree := $(shell cd $(top_srcdir) && pwd)
|
abs_srctree := $(shell cd $(top_srcdir) && pwd)
|
||||||
KHDR_INCLUDES := -D_GNU_SOURCE -isystem ${abs_srctree}/usr/include
|
KHDR_INCLUDES := -isystem ${abs_srctree}/usr/include
|
||||||
DEFAULT_INSTALL_HDR_PATH := 1
|
DEFAULT_INSTALL_HDR_PATH := 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <linux/limits.h>
|
#include <linux/limits.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
|
||||||
|
#define _GNU_SOURCE
|
||||||
#include <linux/limits.h>
|
#include <linux/limits.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
|
|
||||||
|
#define _GNU_SOURCE
|
||||||
#include <linux/limits.h>
|
#include <linux/limits.h>
|
||||||
#include <sys/sysinfo.h>
|
#include <sys/sysinfo.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <linux/limits.h>
|
#include <linux/limits.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <linux/limits.h>
|
#include <linux/limits.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <linux/limits.h>
|
#include <linux/limits.h>
|
||||||
#include <linux/oom.h>
|
#include <linux/oom.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <linux/limits.h>
|
#include <linux/limits.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
#define __KSELFTEST_HARNESS_H
|
#define __KSELFTEST_HARNESS_H
|
||||||
|
|
||||||
#ifndef _GNU_SOURCE
|
#ifndef _GNU_SOURCE
|
||||||
static_assert(0, "kselftest harness requires _GNU_SOURCE to be defined");
|
#define _GNU_SOURCE
|
||||||
#endif
|
#endif
|
||||||
#include <asm/types.h>
|
#include <asm/types.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
|
@ -67,7 +67,7 @@ MAKEFLAGS += --no-print-directory
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(KHDR_INCLUDES),)
|
ifeq ($(KHDR_INCLUDES),)
|
||||||
KHDR_INCLUDES := -D_GNU_SOURCE -isystem $(top_srcdir)/usr/include
|
KHDR_INCLUDES := -isystem $(top_srcdir)/usr/include
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# In order to use newer items that haven't yet been added to the user's system
|
# In order to use newer items that haven't yet been added to the user's system
|
||||||
|
|
|
@ -12,7 +12,7 @@ OBJCOPY := $(CROSS_COMPILE)objcopy
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INCLUDES := -I$(top_srcdir)/tools/include
|
INCLUDES := -I$(top_srcdir)/tools/include
|
||||||
HOST_CFLAGS := -Wall -Werror $(KHDR_INCLUDES) -g $(INCLUDES) -fPIC
|
HOST_CFLAGS := -Wall -Werror -g $(INCLUDES) -fPIC
|
||||||
HOST_LDFLAGS := -z noexecstack -lcrypto
|
HOST_LDFLAGS := -z noexecstack -lcrypto
|
||||||
ENCL_CFLAGS += -Wall -Werror -static-pie -nostdlib -ffreestanding -fPIE \
|
ENCL_CFLAGS += -Wall -Werror -static-pie -nostdlib -ffreestanding -fPIE \
|
||||||
-fno-stack-protector -mrdrnd $(INCLUDES)
|
-fno-stack-protector -mrdrnd $(INCLUDES)
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
/* Copyright(c) 2016-20 Intel Corporation. */
|
/* Copyright(c) 2016-20 Intel Corporation. */
|
||||||
|
|
||||||
|
#define _GNU_SOURCE
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
Loading…
Reference in a new issue