mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	selftests: centralize -D_GNU_SOURCE= to CFLAGS in lib.mk
Centralize the _GNU_SOURCE definition to CFLAGS in lib.mk. Remove redundant defines from Makefiles that import lib.mk. Convert any usage of "#define _GNU_SOURCE 1" to "#define _GNU_SOURCE". This uses the form "-D_GNU_SOURCE=", which is equivalent to "#define _GNU_SOURCE". Otherwise using "-D_GNU_SOURCE" is equivalent to "-D_GNU_SOURCE=1" and "#define _GNU_SOURCE 1", which is less commonly seen in source code and would require many changes in selftests to avoid redefinition warnings. Link: https://lkml.kernel.org/r/20240625223454.1586259-2-edliaw@google.com Signed-off-by: Edward Liaw <edliaw@google.com> Suggested-by: John Hubbard <jhubbard@nvidia.com> Acked-by: Shuah Khan <skhan@linuxfoundation.org> Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: André Almeida <andrealmeid@igalia.com> Cc: Darren Hart <dvhart@infradead.org> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: David S. Miller <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Eric W. Biederman <ebiederm@xmission.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Jarkko Sakkinen <jarkko@kernel.org> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Kees Cook <kees@kernel.org> Cc: Kevin Tian <kevin.tian@intel.com> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Reinette Chatre <reinette.chatre@intel.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									95139d9408
								
							
						
					
					
						commit
						cc937dad85
					
				
					 15 changed files with 12 additions and 15 deletions
				
			
		| 
						 | 
					@ -1,7 +1,6 @@
 | 
				
			||||||
# SPDX-License-Identifier: GPL-2.0
 | 
					# SPDX-License-Identifier: GPL-2.0
 | 
				
			||||||
CFLAGS = -Wall
 | 
					CFLAGS = -Wall
 | 
				
			||||||
CFLAGS += -Wno-nonnull
 | 
					CFLAGS += -Wno-nonnull
 | 
				
			||||||
CFLAGS += -D_GNU_SOURCE
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_PROGS := binfmt_script.py
 | 
					TEST_PROGS := binfmt_script.py
 | 
				
			||||||
TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216 non-regular
 | 
					TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216 non-regular
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
# SPDX-License-Identifier: GPL-2.0
 | 
					# SPDX-License-Identifier: GPL-2.0
 | 
				
			||||||
INCLUDES := -I../include -I../../ $(KHDR_INCLUDES)
 | 
					INCLUDES := -I../include -I../../ $(KHDR_INCLUDES)
 | 
				
			||||||
CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE= -pthread $(INCLUDES) $(KHDR_INCLUDES)
 | 
					CFLAGS := $(CFLAGS) -g -O2 -Wall -pthread $(INCLUDES) $(KHDR_INCLUDES)
 | 
				
			||||||
LDLIBS := -lpthread -lrt
 | 
					LDLIBS := -lpthread -lrt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LOCAL_HDRS := \
 | 
					LOCAL_HDRS := \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
# SPDX-License-Identifier: GPL-2.0
 | 
					# SPDX-License-Identifier: GPL-2.0
 | 
				
			||||||
CFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE
 | 
					CFLAGS := $(CFLAGS) -Wall
 | 
				
			||||||
LDLIBS += -lm
 | 
					LDLIBS += -lm
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARCH ?= $(shell uname -m 2>/dev/null || echo not)
 | 
					ARCH ?= $(shell uname -m 2>/dev/null || echo not)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,8 +2,6 @@
 | 
				
			||||||
CFLAGS += -Wall -O2 -Wno-unused-function
 | 
					CFLAGS += -Wall -O2 -Wno-unused-function
 | 
				
			||||||
CFLAGS += $(KHDR_INCLUDES)
 | 
					CFLAGS += $(KHDR_INCLUDES)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CFLAGS += -D_GNU_SOURCE
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
TEST_GEN_PROGS :=
 | 
					TEST_GEN_PROGS :=
 | 
				
			||||||
TEST_GEN_PROGS += iommufd
 | 
					TEST_GEN_PROGS += iommufd
 | 
				
			||||||
TEST_GEN_PROGS += iommufd_fail_nth
 | 
					TEST_GEN_PROGS += iommufd_fail_nth
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -231,7 +231,7 @@ LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \
 | 
					CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \
 | 
				
			||||||
	-Wno-gnu-variable-sized-type-not-at-end -MD -MP -DCONFIG_64BIT \
 | 
						-Wno-gnu-variable-sized-type-not-at-end -MD -MP -DCONFIG_64BIT \
 | 
				
			||||||
	-D_GNU_SOURCE -fno-builtin-memcmp -fno-builtin-memcpy \
 | 
						-fno-builtin-memcmp -fno-builtin-memcpy \
 | 
				
			||||||
	-fno-builtin-memset -fno-builtin-strnlen \
 | 
						-fno-builtin-memset -fno-builtin-strnlen \
 | 
				
			||||||
	-fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \
 | 
						-fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \
 | 
				
			||||||
	-I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \
 | 
						-I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -188,6 +188,9 @@ endef
 | 
				
			||||||
clean: $(if $(TEST_GEN_MODS_DIR),clean_mods_dir)
 | 
					clean: $(if $(TEST_GEN_MODS_DIR),clean_mods_dir)
 | 
				
			||||||
	$(CLEAN)
 | 
						$(CLEAN)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Build with _GNU_SOURCE by default
 | 
				
			||||||
 | 
					CFLAGS += -D_GNU_SOURCE=
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Enables to extend CFLAGS and LDFLAGS from command line, e.g.
 | 
					# Enables to extend CFLAGS and LDFLAGS from command line, e.g.
 | 
				
			||||||
# make USERCFLAGS=-Werror USERLDFLAGS=-static
 | 
					# make USERCFLAGS=-Werror USERLDFLAGS=-static
 | 
				
			||||||
CFLAGS += $(USERCFLAGS)
 | 
					CFLAGS += $(USERCFLAGS)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,7 +13,7 @@
 | 
				
			||||||
   sudo ipcs | awk '$1 == "0x00000000" {print $2}' | xargs -n1 sudo ipcrm -m
 | 
					   sudo ipcs | awk '$1 == "0x00000000" {print $2}' | xargs -n1 sudo ipcrm -m
 | 
				
			||||||
   (warning this will remove all if someone else uses them) */
 | 
					   (warning this will remove all if someone else uses them) */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define _GNU_SOURCE 1
 | 
					#define _GNU_SOURCE
 | 
				
			||||||
#include <sys/mman.h>
 | 
					#include <sys/mman.h>
 | 
				
			||||||
#include <linux/mman.h>
 | 
					#include <linux/mman.h>
 | 
				
			||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
# SPDX-License-Identifier: GPL-2.0
 | 
					# SPDX-License-Identifier: GPL-2.0
 | 
				
			||||||
# Makefile for net selftests
 | 
					# Makefile for net selftests
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g
 | 
					CFLAGS +=  -Wall -Wl,--no-as-needed -O2 -g
 | 
				
			||||||
CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES)
 | 
					CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES)
 | 
				
			||||||
# Additional include paths needed by kselftest.h
 | 
					# Additional include paths needed by kselftest.h
 | 
				
			||||||
CFLAGS += -I../
 | 
					CFLAGS += -I../
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -26,7 +26,7 @@ LIB	:= $(LIBDIR)/libaotst.a
 | 
				
			||||||
LDLIBS	+= $(LIB) -pthread
 | 
					LDLIBS	+= $(LIB) -pthread
 | 
				
			||||||
LIBDEPS	:= lib/aolib.h Makefile
 | 
					LIBDEPS	:= lib/aolib.h Makefile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CFLAGS	:= -Wall -O2 -g -D_GNU_SOURCE -fno-strict-aliasing
 | 
					CFLAGS	+= -Wall -O2 -g -fno-strict-aliasing
 | 
				
			||||||
CFLAGS	+= $(KHDR_INCLUDES)
 | 
					CFLAGS	+= $(KHDR_INCLUDES)
 | 
				
			||||||
CFLAGS	+= -iquote ./lib/ -I ../../../../include/
 | 
					CFLAGS	+= -iquote ./lib/ -I ../../../../include/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,5 @@
 | 
				
			||||||
# SPDX-License-Identifier: GPL-2.0-only
 | 
					# SPDX-License-Identifier: GPL-2.0-only
 | 
				
			||||||
CFLAGS += -Wall -O2 -Wno-unused-function
 | 
					CFLAGS += -Wall -O2 -Wno-unused-function
 | 
				
			||||||
CFLAGS += -D_GNU_SOURCE
 | 
					 | 
				
			||||||
LDFLAGS += -pthread
 | 
					LDFLAGS += -pthread
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_GEN_PROGS :=
 | 
					TEST_GEN_PROGS :=
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
# SPDX-License-Identifier: GPL-2.0
 | 
					# SPDX-License-Identifier: GPL-2.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
 | 
					CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2
 | 
				
			||||||
CFLAGS += $(KHDR_INCLUDES)
 | 
					CFLAGS += $(KHDR_INCLUDES)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_GEN_PROGS := resctrl_tests
 | 
					TEST_GEN_PROGS := resctrl_tests
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,6 @@
 | 
				
			||||||
# SPDX-License-Identifier: GPL-2.0
 | 
					# SPDX-License-Identifier: GPL-2.0
 | 
				
			||||||
CFLAGS += -Wl,-no-as-needed -Wall
 | 
					CFLAGS += -Wl,-no-as-needed -Wall
 | 
				
			||||||
CFLAGS += $(KHDR_INCLUDES)
 | 
					CFLAGS += $(KHDR_INCLUDES)
 | 
				
			||||||
CFLAGS += -D_GNU_SOURCE
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_GEN_PROGS = map_test
 | 
					TEST_GEN_PROGS = map_test
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@
 | 
				
			||||||
# Originally tools/testing/arm64/abi/Makefile
 | 
					# Originally tools/testing/arm64/abi/Makefile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Additional include paths needed by kselftest.h and local headers
 | 
					# Additional include paths needed by kselftest.h and local headers
 | 
				
			||||||
CFLAGS += -D_GNU_SOURCE -std=gnu99 -I.
 | 
					CFLAGS += -std=gnu99 -I.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_GEN_FILES := mmap_default mmap_bottomup
 | 
					TEST_GEN_FILES := mmap_default mmap_bottomup
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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 -g $(INCLUDES) -fPIC
 | 
					HOST_CFLAGS := -Wall -Werror -g $(INCLUDES) -fPIC $(CFLAGS)
 | 
				
			||||||
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,5 @@
 | 
				
			||||||
# SPDX-License-Identifier: GPL-2.0-only
 | 
					# SPDX-License-Identifier: GPL-2.0-only
 | 
				
			||||||
CFLAGS += -Wall -O2
 | 
					CFLAGS += -Wall -O2
 | 
				
			||||||
CFLAGS += -D_GNU_SOURCE
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_GEN_PROGS :=
 | 
					TEST_GEN_PROGS :=
 | 
				
			||||||
TEST_GEN_PROGS += bug-link-o-tmpfile
 | 
					TEST_GEN_PROGS += bug-link-o-tmpfile
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue