Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5453a3df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kconfig-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull Kconfig updates from Masahiro Yamada:

 - rename lexer and parse files

 - fix 'Save as' menu of xconfig

* tag 'kconfig-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: fix 'Save As' menu of xconfig
  kconfig: rename zconf.y to parser.y
  kconfig: rename zconf.l to lexer.l
parents add8462a 8741908b

scripts/kconfig/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -143,11 +143,12 @@ help: 


# ===========================================================================

# object files used by all kconfig flavours

common-objs	:= confdata.o expr.o symbol.o preprocess.o zconf.lex.o zconf.tab.o

common-objs	:= confdata.o expr.o lexer.lex.o parser.tab.o preprocess.o \

		   symbol.o



$(obj)/zconf.lex.o: $(obj)/zconf.tab.h

HOSTCFLAGS_zconf.lex.o	:= -I$(src)

HOSTCFLAGS_zconf.tab.o	:= -I$(src)

$(obj)/lexer.lex.o: $(obj)/parser.tab.h

HOSTCFLAGS_lexer.lex.o	:= -I$(src)

HOSTCFLAGS_parser.tab.o	:= -I$(src)



# conf: Used for defconfig, oldconfig and related targets

hostprogs-y	+= conf

scripts/kconfig/expr.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ struct symbol { 
 *         int "BAZ Value"

 *         range 1..255

 *

 * Please, also check zconf.y:print_symbol() when modifying the

 * Please, also check parser.y:print_symbol() when modifying the

 * list of property types!

 */

enum prop_type {

scripts/kconfig/zconf.l→scripts/kconfig/lexer.l

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <unistd.h>



#include "lkc.h"

#include "zconf.tab.h"

#include "parser.tab.h"



#define YY_DECL		static int yylex1(void)

scripts/kconfig/lkc.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void *xrealloc(void *p, size_t size); 
char *xstrdup(const char *s);

char *xstrndup(const char *s, size_t n);



/* zconf.l */

/* lexer.l */

int yylex(void);



struct gstr {

scripts/kconfig/zconf.y→scripts/kconfig/parser.y

+0 −0

File moved.

View file