Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada:
- clean-up leftovers in Kconfig files
- remove stale oldnoconfig and silentoldconfig targets
- remove unneeded cc-fullversion and cc-name variables
- improve merge_config script to allow overriding option prefix
* tag 'kbuild-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: remove cc-name variable
kbuild: replace cc-name test with CONFIG_CC_IS_CLANG
merge_config.sh: Allow to define config prefix
kbuild: remove unused cc-fullversion variable
kconfig: remove silentoldconfig target
kconfig: remove oldnoconfig target
powerpc: PCI_MSI needs PCI
powerpc: remove CONFIG_MCA leftovers
powerpc: remove CONFIG_PCI_QSPAN
scsi: aha152x: rename the PCMCIA define
+28
-78
-15
Documentation/kbuild/makefiles.txt
-15
Documentation/kbuild/makefiles.txt
···
537
537
The third parameter may be a text as in this example, but it may also
538
538
be an expanded variable or a macro.
539
539
540
-
cc-fullversion
541
-
cc-fullversion is useful when the exact version of gcc is needed.
542
-
One typical use-case is when a specific GCC version is broken.
543
-
cc-fullversion points out a more specific version than cc-version does.
544
-
545
-
Example:
546
-
#arch/powerpc/Makefile
547
-
$(Q)if test "$(cc-fullversion)" = "040200" ; then \
548
-
echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \
549
-
false ; \
550
-
fi
551
-
552
-
In this example for a specific GCC version the build will error out
553
-
explaining to the user why it stops.
554
-
555
540
cc-cross-prefix
556
541
cc-cross-prefix is used to check if there exists a $(CC) in path with
557
542
one of the listed prefixes. The first prefix where there exist a
+1
-1
Documentation/networking/ice.rst
+1
-1
Documentation/networking/ice.rst
+2
-2
Makefile
+2
-2
Makefile
···
485
485
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)
486
486
endif
487
487
488
-
ifeq ($(cc-name),clang)
488
+
ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)
489
489
ifneq ($(CROSS_COMPILE),)
490
490
CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%))
491
491
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
···
702
702
703
703
KBUILD_CFLAGS += $(stackp-flags-y)
704
704
705
-
ifeq ($(cc-name),clang)
705
+
ifdef CONFIG_CC_IS_CLANG
706
706
KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
707
707
KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
708
708
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
+1
-1
arch/mips/Makefile
+1
-1
arch/mips/Makefile
···
128
128
# clang's output will be based upon the build machine. So for clang we simply
129
129
# unconditionally specify -EB or -EL as appropriate.
130
130
#
131
-
ifeq ($(cc-name),clang)
131
+
ifdef CONFIG_CC_IS_CLANG
132
132
cflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB
133
133
cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -EL
134
134
else
+1
-1
arch/mips/vdso/Makefile
+1
-1
arch/mips/vdso/Makefile
-13
arch/powerpc/Kconfig
-13
arch/powerpc/Kconfig
···
930
930
help
931
931
Freescale General-purpose Timers support
932
932
933
-
# Yes MCA RS/6000s exist but Linux-PPC does not currently support any
934
-
config MCA
935
-
bool
936
-
937
933
# Platforms that what PCI turned unconditionally just do select PCI
938
934
# in their config node. Platforms that want to choose at config
939
935
# time should select PPC_PCI_CHOICE
···
940
944
bool "PCI support" if PPC_PCI_CHOICE
941
945
default y if !40x && !CPM2 && !PPC_8xx && !PPC_83xx \
942
946
&& !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
943
-
default PCI_QSPAN if PPC_8xx
944
947
select GENERIC_PCI_IOMAP
945
948
help
946
949
Find out whether your system includes a PCI bus. PCI is the name of
···
952
957
953
958
config PCI_SYSCALL
954
959
def_bool PCI
955
-
956
-
config PCI_QSPAN
957
-
bool "QSpan PCI"
958
-
depends on PPC_8xx
959
-
select PPC_I8259
960
-
help
961
-
Say Y here if you have a system based on a Motorola 8xx-series
962
-
embedded processor with a QSPAN PCI interface, otherwise say N.
963
960
964
961
config PCI_8260
965
962
bool
+2
-2
arch/powerpc/Makefile
+2
-2
arch/powerpc/Makefile
···
96
96
aflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -mabi=elfv2
97
97
endif
98
98
99
-
ifneq ($(cc-name),clang)
99
+
ifndef CONFIG_CC_IS_CLANG
100
100
cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -mno-strict-align
101
101
endif
102
102
···
175
175
# Work around gcc code-gen bugs with -pg / -fno-omit-frame-pointer in gcc <= 4.8
176
176
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44199
177
177
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52828
178
-
ifneq ($(cc-name),clang)
178
+
ifndef CONFIG_CC_IS_CLANG
179
179
CC_FLAGS_FTRACE += $(call cc-ifversion, -lt, 0409, -mno-sched-epilog)
180
180
endif
181
181
endif
+1
arch/powerpc/platforms/40x/Kconfig
+1
arch/powerpc/platforms/40x/Kconfig
+2
arch/powerpc/platforms/44x/Kconfig
+2
arch/powerpc/platforms/44x/Kconfig
···
21
21
depends on 44x
22
22
select PPC44x_SIMPLE
23
23
select APM821xx
24
+
select PCI
24
25
select PCI_MSI
25
26
select PPC4xx_MSI
26
27
select PPC4xx_PCI_EXPRESS
···
201
200
select SWIOTLB
202
201
select 476FPE
203
202
select PPC4xx_PCI_EXPRESS
203
+
select PCI
204
204
select PCI_MSI
205
205
select PPC4xx_HSTA_MSI
206
206
select I2C
+3
-3
drivers/scsi/Kconfig
+3
-3
drivers/scsi/Kconfig
···
538
538
539
539
config SCSI_BUSLOGIC
540
540
tristate "BusLogic SCSI support"
541
-
depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API && VIRT_TO_BUS
541
+
depends on (PCI || ISA) && SCSI && ISA_DMA_API && VIRT_TO_BUS
542
542
---help---
543
543
This is support for BusLogic MultiMaster and FlashPoint SCSI Host
544
544
Adapters. Consult the SCSI-HOWTO, available from
···
1175
1175
1176
1176
config SCSI_SIM710
1177
1177
tristate "Simple 53c710 SCSI support (Compaq, NCR machines)"
1178
-
depends on (EISA || MCA) && SCSI
1178
+
depends on EISA && SCSI
1179
1179
select SCSI_SPI_ATTRS
1180
1180
---help---
1181
1181
This driver is for NCR53c710 based SCSI host adapters.
1182
1182
1183
-
It currently supports Compaq EISA cards and NCR MCA cards
1183
+
It currently supports Compaq EISA cards.
1184
1184
1185
1185
config SCSI_DC395x
1186
1186
tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support"
+7
-7
drivers/scsi/aha152x.c
+7
-7
drivers/scsi/aha152x.c
···
269
269
/* DEFINES */
270
270
271
271
/* For PCMCIA cards, always use AUTOCONF */
272
-
#if defined(PCMCIA) || defined(MODULE)
272
+
#if defined(AHA152X_PCMCIA) || defined(MODULE)
273
273
#if !defined(AUTOCONF)
274
274
#define AUTOCONF
275
275
#endif
···
297
297
298
298
#define DELAY_DEFAULT 1000
299
299
300
-
#if defined(PCMCIA)
300
+
#if defined(AHA152X_PCMCIA)
301
301
#define IRQ_MIN 0
302
302
#define IRQ_MAX 16
303
303
#else
···
328
328
MODULE_DESCRIPTION(AHA152X_REVID);
329
329
MODULE_LICENSE("GPL");
330
330
331
-
#if !defined(PCMCIA)
331
+
#if !defined(AHA152X_PCMCIA)
332
332
#if defined(MODULE)
333
333
static int io[] = {0, 0};
334
334
module_param_hw_array(io, int, ioport, NULL, 0);
···
391
391
MODULE_DEVICE_TABLE(isapnp, id_table);
392
392
#endif /* ISAPNP */
393
393
394
-
#endif /* !PCMCIA */
394
+
#endif /* !AHA152X_PCMCIA */
395
395
396
396
static struct scsi_host_template aha152x_driver_template;
397
397
···
863
863
if (shpnt->irq)
864
864
free_irq(shpnt->irq, shpnt);
865
865
866
-
#if !defined(PCMCIA)
866
+
#if !defined(AHA152X_PCMCIA)
867
867
if (shpnt->io_port)
868
868
release_region(shpnt->io_port, IO_RANGE);
869
869
#endif
···
2924
2924
.slave_alloc = aha152x_adjust_queue,
2925
2925
};
2926
2926
2927
-
#if !defined(PCMCIA)
2927
+
#if !defined(AHA152X_PCMCIA)
2928
2928
static int setup_count;
2929
2929
static struct aha152x_setup setup[2];
2930
2930
···
3392
3392
__setup("aha152x=", aha152x_setup);
3393
3393
#endif
3394
3394
3395
-
#endif /* !PCMCIA */
3395
+
#endif /* !AHA152X_PCMCIA */
+1
-1
drivers/scsi/pcmcia/aha152x_core.c
+1
-1
drivers/scsi/pcmcia/aha152x_core.c
-8
scripts/Kbuild.include
-8
scripts/Kbuild.include
···
140
140
cc-disable-warning = $(call try-run,\
141
141
$(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
142
142
143
-
# cc-name
144
-
# Expands to either gcc or clang
145
-
cc-name = $(shell $(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)
146
-
147
143
# cc-version
148
144
cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
149
-
150
-
# cc-fullversion
151
-
cc-fullversion = $(shell $(CONFIG_SHELL) \
152
-
$(srctree)/scripts/gcc-version.sh -p $(CC))
153
145
154
146
# cc-ifversion
155
147
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
+1
-1
scripts/Makefile.extrawarn
+1
-1
scripts/Makefile.extrawarn
···
65
65
KBUILD_CFLAGS += $(warning)
66
66
else
67
67
68
-
ifeq ($(cc-name),clang)
68
+
ifdef CONFIG_CC_IS_CLANG
69
69
KBUILD_CFLAGS += $(call cc-disable-warning, initializer-overrides)
70
70
KBUILD_CFLAGS += $(call cc-disable-warning, unused-value)
71
71
KBUILD_CFLAGS += $(call cc-disable-warning, format)
+1
-15
scripts/kconfig/Makefile
+1
-15
scripts/kconfig/Makefile
···
68
68
$(simple-targets): $(obj)/conf
69
69
$< $(silent) --$@ $(Kconfig)
70
70
71
-
PHONY += oldnoconfig silentoldconfig savedefconfig defconfig
72
-
73
-
# oldnoconfig is an alias of olddefconfig, because people already are dependent
74
-
# on its behavior (sets new symbols to their default value but not 'n') with the
75
-
# counter-intuitive name.
76
-
oldnoconfig: olddefconfig
77
-
@echo " WARNING: \"oldnoconfig\" target will be removed after Linux 4.19"
78
-
@echo " Please use \"olddefconfig\" instead, which is an alias."
79
-
80
-
# We do not expect manual invokcation of "silentoldcofig" (or "syncconfig").
81
-
silentoldconfig: syncconfig
82
-
@echo " WARNING: \"silentoldconfig\" has been renamed to \"syncconfig\""
83
-
@echo " and is now an internal implementation detail."
84
-
@echo " What you want is probably \"oldconfig\"."
85
-
@echo " \"silentoldconfig\" will be removed after Linux 4.19"
71
+
PHONY += savedefconfig defconfig
86
72
87
73
savedefconfig: $(obj)/conf
88
74
$< $(silent) --$@=defconfig $(Kconfig)
-7
scripts/kconfig/conf.c
-7
scripts/kconfig/conf.c
···
460
460
{"randconfig", no_argument, NULL, randconfig},
461
461
{"listnewconfig", no_argument, NULL, listnewconfig},
462
462
{"olddefconfig", no_argument, NULL, olddefconfig},
463
-
/*
464
-
* oldnoconfig is an alias of olddefconfig, because people already
465
-
* are dependent on its behavior(sets new symbols to their default
466
-
* value but not 'n') with the counter-intuitive name.
467
-
*/
468
-
{"oldnoconfig", no_argument, NULL, olddefconfig},
469
463
{NULL, 0, NULL, 0}
470
464
};
471
465
···
474
480
printf(" --syncconfig Similar to oldconfig but generates configuration in\n"
475
481
" include/{generated/,config/}\n");
476
482
printf(" --olddefconfig Same as oldconfig but sets new symbols to their default value\n");
477
-
printf(" --oldnoconfig An alias of olddefconfig\n");
478
483
printf(" --defconfig <file> New config with default defined in <file>\n");
479
484
printf(" --savedefconfig <file> Save the minimal current configuration to <file>\n");
480
485
printf(" --allnoconfig New config where all options are answered with no\n");
+5
-1
scripts/kconfig/merge_config.sh
+5
-1
scripts/kconfig/merge_config.sh
···
33
33
echo " -n use allnoconfig instead of alldefconfig"
34
34
echo " -r list redundant entries when merging fragments"
35
35
echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead."
36
+
echo
37
+
echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
36
38
}
37
39
38
40
RUNMAKE=true
39
41
ALLTARGET=alldefconfig
40
42
WARNREDUN=false
41
43
OUTPUT=.
44
+
CONFIG_PREFIX=${CONFIG_-CONFIG_}
42
45
43
46
while true; do
44
47
case $1 in
···
102
99
fi
103
100
104
101
MERGE_LIST=$*
105
-
SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
102
+
SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
103
+
106
104
TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
107
105
108
106
echo "Using $INITFILE as base"