diff options
| author | Chris Packham <judge.packham@gmail.com> | 2020-12-10 19:46:43 +1300 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2021-02-02 20:06:32 +1300 |
| commit | 31695dd2b00fc3daac109324992901fdcd6068e5 (patch) | |
| tree | 4084c739c47255711345e716d70ebe1732c80ad2 /kconfig/preprocess.c | |
| parent | 141f88a5f640625f63f70dad6f216a81596c42fc (diff) | |
| download | crosstool-ng-31695dd2b00fc3daac109324992901fdcd6068e5.tar.gz crosstool-ng-31695dd2b00fc3daac109324992901fdcd6068e5.tar.bz2 crosstool-ng-31695dd2b00fc3daac109324992901fdcd6068e5.zip | |
kconfig: Sync with upstream v5.3
This commit introduces the following upstream changes:
0c5b6c28ed68 kconfig: Clear "written" flag to avoid data loss
8e2442a5f86e kconfig: fix missing choice values in auto.conf
3266c806dc86 kconfig: run olddefconfig instead of oldconfig after merging fragments
e3cd5136a4ec kconfig: remove meaningless if-conditional in conf_read()
baa23ec86092 kconfig: Fix spelling of sym_is_changable
cd238effefa2 docs: kbuild: convert docs to ReST and rename to *.rst
bd305f259cd3 kconfig: make arch/*/configs/defconfig the default of KBUILD_DEFCONFIG
5533397d1ec8 kconfig: add static qualifier to expand_string()
b6f7e9f7050b kconfig: require the argument of --defconfig
e0a2668665a5 kconfig: remove always false ifeq ($(KBUILD_DEFCONFIG,) conditional
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'kconfig/preprocess.c')
| -rw-r--r-- | kconfig/preprocess.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kconfig/preprocess.c b/kconfig/preprocess.c index 592dfbfa..0243086f 100644 --- a/kconfig/preprocess.c +++ b/kconfig/preprocess.c @@ -15,6 +15,7 @@ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) static char *expand_string_with_args(const char *in, int argc, char *argv[]); +static char *expand_string(const char *in); static void __attribute__((noreturn)) pperror(const char *format, ...) { @@ -550,7 +551,7 @@ static char *expand_string_with_args(const char *in, int argc, char *argv[]) return __expand_string(&in, is_end_of_str, argc, argv); } -char *expand_string(const char *in) +static char *expand_string(const char *in) { return expand_string_with_args(in, 0, NULL); } |