mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-25 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefiles: Use ccflags-y instead of EXTRA_CFLAGS

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8076 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-03-25 19:56:17 +00:00
parent 74e5b31b95
commit 70d3c72779
14 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fcst/Makefile_in-tree
View File

@@ -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

10
iscsi-scst/kernel/Makefile
View File

@@ -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 \

6
iscsi-scst/kernel/isert-scst/Makefile
View File

@@ -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 \

4
qla2x00t/Makefile
View File

@@ -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

14
qla2x00t/qla2x00-target/Makefile
View File

@@ -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

2
qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23
View File

@@ -1,4 +1,4 @@
EXTRA_CFLAGS += -Iinclude/scst -Idrivers/scsi/qla2xxx
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o

2
scst/kernel/in-tree/Makefile.dev_handlers-2.6.23
View File

@@ -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

2
scst/kernel/in-tree/Makefile.scst-2.6.23
View File

@@ -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

22
scst/src/Makefile
View File

@@ -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

6
scst/src/dev_handlers/Makefile
View File

@@ -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

8
scst_local/Makefile
View File

@@ -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

2
scst_local/in-tree/Makefile-2.6.23
View File

@@ -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

4
srpt/Testing.txt
View File

@@ -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.

6
srpt/src/Makefile
View File

@@ -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