From 70d3c727790ae34528c42183be826ec2b9127bd2 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 25 Mar 2019 19:56:17 +0000 Subject: [PATCH] Makefiles: Use ccflags-y instead of EXTRA_CFLAGS git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8076 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- fcst/Makefile_in-tree | 2 +- iscsi-scst/kernel/Makefile | 10 ++++----- iscsi-scst/kernel/isert-scst/Makefile | 6 ++--- qla2x00t/Makefile | 4 ++-- qla2x00t/qla2x00-target/Makefile | 14 ++++++------ .../qla2x00-target/Makefile_in-tree-2.6.23 | 2 +- .../in-tree/Makefile.dev_handlers-2.6.23 | 2 +- scst/kernel/in-tree/Makefile.scst-2.6.23 | 2 +- scst/src/Makefile | 22 +++++++++---------- scst/src/dev_handlers/Makefile | 6 ++--- scst_local/Makefile | 8 +++---- scst_local/in-tree/Makefile-2.6.23 | 2 +- srpt/Testing.txt | 4 ++-- srpt/src/Makefile | 6 ++--- 14 files changed, 45 insertions(+), 45 deletions(-) diff --git a/fcst/Makefile_in-tree b/fcst/Makefile_in-tree index 5a987d0c6..8f9ad3366 100644 --- a/fcst/Makefile_in-tree +++ b/fcst/Makefile_in-tree @@ -7,7 +7,7 @@ BUILD_MODE_CFLAGS_ = -DDEBUG_WORK_IN_THREAD -DCONFIG_SCST_TRACING \ -fno-inline -fno-inline-functions BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING BUILD_MODE_CFLAGS_PERF = -EXTRA_CFLAGS += -I$(SCST_INC_DIR) $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) +ccflags-y += -I$(SCST_INC_DIR) $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) obj-$(CONFIG_FCST) += fcst.o diff --git a/iscsi-scst/kernel/Makefile b/iscsi-scst/kernel/Makefile index d5fb29bcc..70ae0ca8d 100644 --- a/iscsi-scst/kernel/Makefile +++ b/iscsi-scst/kernel/Makefile @@ -20,12 +20,12 @@ # # Note 2! The CFLAGS definitions are now in the main makefile. -EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) -EXTRA_CFLAGS += $(call cc-option,-Wextra) \ +ccflags-y += -I$(src)/../include -I$(SCST_INC_DIR) +ccflags-y += $(call cc-option,-Wextra) \ $(call cc-option,-Wno-old-style-declaration) \ -Wno-unused-parameter -Wno-missing-field-initializers -EXTRA_CFLAGS += $(PRE_CFLAGS) -#EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES +ccflags-y += $(PRE_CFLAGS) +#ccflags-y += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES -include $(KBUILD_EXTMOD)/../../build_mode @@ -35,7 +35,7 @@ BUILD_MODE_CFLAGS_ = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \ -DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING BUILD_MODE_CFLAGS_PERF = -EXTRA_CFLAGS += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) +ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) obj-m += iscsi-scst.o iscsi-scst-objs := iscsi.o nthread.o config.o digest.o \ diff --git a/iscsi-scst/kernel/isert-scst/Makefile b/iscsi-scst/kernel/isert-scst/Makefile index 140d5d2a8..a4adc5438 100644 --- a/iscsi-scst/kernel/isert-scst/Makefile +++ b/iscsi-scst/kernel/isert-scst/Makefile @@ -21,8 +21,8 @@ # Note 2! The CFLAGS definitions are now in the main makefile. LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE) -EXTRA_CFLAGS += -I$(src)/../../include -I$(SCST_INC_DIR) -EXTRA_CFLAGS += $(call cc-option,-Wextra) \ +ccflags-y += -I$(src)/../../include -I$(SCST_INC_DIR) +ccflags-y += $(call cc-option,-Wextra) \ $(call cc-option,-Wno-old-style-declaration) \ -Wno-unused-parameter -Wno-missing-field-initializers @@ -34,7 +34,7 @@ BUILD_MODE_CFLAGS_ = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \ -DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING BUILD_MODE_CFLAGS_PERF = -EXTRA_CFLAGS += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) +ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) obj-m += isert-scst.o isert-scst-objs := isert.o isert_login.o \ diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile index f57921a52..aafa94f53 100644 --- a/qla2x00t/Makefile +++ b/qla2x00t/Makefile @@ -46,11 +46,11 @@ endif INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra ifneq ($(PATCHLEVEL),) -EXTRA_CFLAGS += $(call cc-option,-Wextra) -Wno-unused-parameter \ +ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter \ -Wno-missing-field-initializers -I$(SCST_INC_DIR) ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),) -EXTRA_CFLAGS += -DCONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET) +ccflags-y += -DCONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET) endif obj-m := qla2xxx_scst.o diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile index eb10eaa64..84b900dbd 100644 --- a/qla2x00t/qla2x00-target/Makefile +++ b/qla2x00t/qla2x00-target/Makefile @@ -59,10 +59,10 @@ QLA2XXX_SCST := qla2xxx_scst endif ifneq ($(PATCHLEVEL),) -EXTRA_CFLAGS += -I$(SCST_INC_DIR) -EXTRA_CFLAGS += -W -Wno-unused-parameter -Wno-missing-field-initializers -#EXTRA_CFLAGS += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD -#EXTRA_CFLAGS += -DCONFIG_QLA_TGT_DEBUG_SRR +ccflags-y += -I$(SCST_INC_DIR) +ccflags-y += -W -Wno-unused-parameter -Wno-missing-field-initializers +#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD +#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_SRR -include $(KBUILD_EXTMOD)/../../build_mode @@ -72,13 +72,13 @@ BUILD_MODE_CFLAGS_ = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \ -DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING BUILD_MODE_CFLAGS_PERF = -EXTRA_CFLAGS += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) +ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) ifneq ($(BUILD_2X_MODULE),) -EXTRA_CFLAGS += -DCONFIG_SCSI_QLA2XXX_TARGET=y +ccflags-y += -DCONFIG_SCSI_QLA2XXX_TARGET=y endif -EXTRA_CFLAGS += -I$(QLA2XXX_INC_DIR) +ccflags-y += -I$(QLA2XXX_INC_DIR) obj-m := qla2x00tgt.o qla2x00tgt-objs := qla2x00t.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23 index 4f2dc0b7e..fc6f8e7fa 100644 --- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23 +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23 @@ -1,4 +1,4 @@ -EXTRA_CFLAGS += -Iinclude/scst -Idrivers/scsi/qla2xxx +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx qla2x00tgt-y := qla2x00t.o diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.23 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.23 index f480d0ea7..8c2c62cbf 100644 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.23 +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.23 @@ -1,4 +1,4 @@ -EXTRA_CFLAGS += -Iinclude/scst -Wno-unused-parameter +ccflags-y += -Iinclude/scst -Wno-unused-parameter obj-$(CONFIG_SCST_DISK) += scst_disk.o obj-$(CONFIG_SCST_TAPE) += scst_tape.o diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.23 b/scst/kernel/in-tree/Makefile.scst-2.6.23 index 09dc56ac9..2a4f338a5 100644 --- a/scst/kernel/in-tree/Makefile.scst-2.6.23 +++ b/scst/kernel/in-tree/Makefile.scst-2.6.23 @@ -1,4 +1,4 @@ -EXTRA_CFLAGS += -Wno-unused-parameter +ccflags-y += -Wno-unused-parameter scst-y += scst_copy_mgr.o scst-y += scst_debug.o diff --git a/scst/src/Makefile b/scst/src/Makefile index f13573208..04b7a43fd 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -38,24 +38,24 @@ DEV_HANDLERS_DIR = dev_handlers ifneq ($(PATCHLEVEL),) SCST_INC_DIR := $(KBUILD_EXTMOD)/../include -EXTRA_CFLAGS += -I$(SCST_INC_DIR) $(call cc-option,-Wextra) \ +ccflags-y += -I$(SCST_INC_DIR) $(call cc-option,-Wextra) \ -Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare\ $(shell [ -n "${CONFIG_SCST_NO_DLM}" ] && echo -DCONFIG_SCST_NO_DLM) -#EXTRA_CFLAGS += -DCONFIG_SCST_STRICT_SERIALIZING -#EXTRA_CFLAGS += -DCONFIG_SCST_USE_EXPECTED_VALUES -#EXTRA_CFLAGS += -DCONFIG_SCST_TEST_IO_IN_SIRQ -#EXTRA_CFLAGS += -DCONFIG_SCST_ABORT_CONSIDER_FINISHED_TASKS_AS_NOT_EXISTING -#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY -#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM -#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_SN -#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_SYSFS_EAGAIN +#ccflags-y += -DCONFIG_SCST_STRICT_SERIALIZING +#ccflags-y += -DCONFIG_SCST_USE_EXPECTED_VALUES +#ccflags-y += -DCONFIG_SCST_TEST_IO_IN_SIRQ +#ccflags-y += -DCONFIG_SCST_ABORT_CONSIDER_FINISHED_TASKS_AS_NOT_EXISTING +#ccflags-y += -DCONFIG_SCST_DEBUG_RETRY +#ccflags-y += -DCONFIG_SCST_DEBUG_OOM +#ccflags-y += -DCONFIG_SCST_DEBUG_SN +#ccflags-y += -DCONFIG_SCST_DEBUG_SYSFS_EAGAIN # If defined, makes SCST zero allocated data buffers. # Undefining it considerably improves performance and eases CPU load, # but could create a security hole (information leakage), so # enable it if you have strict security requirements. -#EXTRA_CFLAGS += -DSCST_STRICT_SECURITY +#ccflags-y += -DSCST_STRICT_SECURITY -include $(KBUILD_EXTMOD)/../../build_mode @@ -65,7 +65,7 @@ BUILD_MODE_CFLAGS_ = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \ -DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING BUILD_MODE_CFLAGS_PERF = -EXTRA_CFLAGS += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) +ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) obj-m := scst.o diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile index dda5c7cc1..20855a3b3 100644 --- a/scst/src/dev_handlers/Makefile +++ b/scst/src/dev_handlers/Makefile @@ -32,10 +32,10 @@ SHELL=/bin/bash ifneq ($(PATCHLEVEL),) SCST_INC_DIR := $(KBUILD_EXTMOD)/../include -EXTRA_CFLAGS += -I$(SCST_INC_DIR) \ +ccflags-y += -I$(SCST_INC_DIR) \ $(call cc-option,-Wextra) \ -Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare -#EXTRA_CFLAGS += -DCONFIG_DEBUG_EXT_COPY_REMAP +#ccflags-y += -DCONFIG_DEBUG_EXT_COPY_REMAP -include $(KBUILD_EXTMOD)/../../build_mode @@ -45,7 +45,7 @@ BUILD_MODE_CFLAGS_ = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \ -DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING BUILD_MODE_CFLAGS_PERF = -EXTRA_CFLAGS += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) +ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ scst_vdisk.o scst_raid.o scst_processor.o scst_user.o diff --git a/scst_local/Makefile b/scst_local/Makefile index 99ed16207..a58f35f3f 100644 --- a/scst_local/Makefile +++ b/scst_local/Makefile @@ -7,11 +7,11 @@ SHELL=/bin/bash KMOD := $(shell pwd)/kernel ifneq ($(PATCHLEVEL),) -EXTRA_CFLAGS += -I$(SCST_INC_DIR) -EXTRA_CFLAGS += $(call cc-option,-Wextra) -Wno-unused-parameter\ +ccflags-y += -I$(SCST_INC_DIR) +ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter\ -Wno-missing-field-initializers -#EXTRA_CFLAGS += -DCONFIG_SCST_LOCAL_DIRECT_PROCESSING +#ccflags-y += -DCONFIG_SCST_LOCAL_DIRECT_PROCESSING -include $(KBUILD_EXTMOD)/../build_mode @@ -21,7 +21,7 @@ BUILD_MODE_CFLAGS_ = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \ -DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING BUILD_MODE_CFLAGS_PERF = -EXTRA_CFLAGS += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) +ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) obj-m := scst_local.o else diff --git a/scst_local/in-tree/Makefile-2.6.23 b/scst_local/in-tree/Makefile-2.6.23 index a54bb760e..ec5e0320c 100644 --- a/scst_local/in-tree/Makefile-2.6.23 +++ b/scst_local/in-tree/Makefile-2.6.23 @@ -1,6 +1,6 @@ SCST_INC_DIR := include/scst SCST_DIR := drivers/scst -EXTRA_CFLAGS += -I$(SCST_INC_DIR) -I$(SCST_DIR) +ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR) obj-$(CONFIG_SCST_LOCAL) += scst_local.o diff --git a/srpt/Testing.txt b/srpt/Testing.txt index 285caf016..cfc8fb2fa 100644 --- a/srpt/Testing.txt +++ b/srpt/Testing.txt @@ -108,8 +108,8 @@ Index: srpt/src/ib_srpt.c * Test the state machine for SCST commands in SRPT by using SCST's error injection mechanism. Add the following to scst/src/Makefile, log in from an initiator system and trigger SRP I/O: - EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g - EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_TM -DCONFIG_SCST_TM_DBG_GO_OFFLINE + ccflags-y += -DCONFIG_SCST_DEBUG -g + ccflags-y += -DCONFIG_SCST_DEBUG_TM -DCONFIG_SCST_TM_DBG_GO_OFFLINE * Test with multiple values of ib_srp_tablesize in the range 1..128. diff --git a/srpt/src/Makefile b/srpt/src/Makefile index 4fb1309da..95d8fa11f 100644 --- a/srpt/src/Makefile +++ b/srpt/src/Makefile @@ -1,6 +1,6 @@ LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE) CPPFLAGS := $(PRE_CFLAGS) $(CPPFLAGS) -EXTRA_CFLAGS += -I$(SCST_INC_DIR) +ccflags-y += -I$(SCST_INC_DIR) -include $(KBUILD_EXTMOD)/../../build_mode @@ -10,8 +10,8 @@ BUILD_MODE_CFLAGS_ = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \ -DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING BUILD_MODE_CFLAGS_PERF = -EXTRA_CFLAGS += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) +ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE)) -#EXTRA_CFLAGS += -Wextra -Wno-unused-parameter +#ccflags-y += -Wextra -Wno-unused-parameter obj-m += ib_srpt.o