| Message ID | 20190815171937.9048-1-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,Bionic] Revert "genksyms: Teach parser about 128-bit built-in types" | expand |
On 8/15/19 10:19 AM, Kamal Mostafa wrote: > BugLink: https://bugs.launchpad.net/bugs/1840321 > > This reverts commit 00e55d63b41f425b1a67e459064be6fcbce731f5. > > This backport from 4.19-stable is not suitable for 4.15. It breaks > the build if CONFIG_MODVERSIONS is turned on. > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > scripts/genksyms/keywords.c | 4 ---- > scripts/genksyms/parse.y | 2 -- > 2 files changed, 6 deletions(-) > > diff --git a/scripts/genksyms/keywords.c b/scripts/genksyms/keywords.c > index f6956aa41366..9f40bcd17d07 100644 > --- a/scripts/genksyms/keywords.c > +++ b/scripts/genksyms/keywords.c > @@ -24,10 +24,6 @@ static struct resword { > { "__volatile__", VOLATILE_KEYW }, > { "__builtin_va_list", VA_LIST_KEYW }, > > - { "__int128", BUILTIN_INT_KEYW }, > - { "__int128_t", BUILTIN_INT_KEYW }, > - { "__uint128_t", BUILTIN_INT_KEYW }, > - > // According to rth, c99 defines "_Bool", __restrict", __restrict__", "restrict". KAO > { "_Bool", BOOL_KEYW }, > { "_restrict", RESTRICT_KEYW }, > diff --git a/scripts/genksyms/parse.y b/scripts/genksyms/parse.y > index 1ebcf52cd0f9..00a6d7e54971 100644 > --- a/scripts/genksyms/parse.y > +++ b/scripts/genksyms/parse.y > @@ -76,7 +76,6 @@ static void record_compound(struct string_list **keyw, > %token ATTRIBUTE_KEYW > %token AUTO_KEYW > %token BOOL_KEYW > -%token BUILTIN_INT_KEYW > %token CHAR_KEYW > %token CONST_KEYW > %token DOUBLE_KEYW > @@ -264,7 +263,6 @@ simple_type_specifier: > | VOID_KEYW > | BOOL_KEYW > | VA_LIST_KEYW > - | BUILTIN_INT_KEYW > | TYPE { (*$1)->tag = SYM_TYPEDEF; $$ = $1; } > ; > > Acked-by: Connor Kuehl <connor.kuehl@canonical.com>
On Thu, Aug 15, 2019 at 10:19:37AM -0700, Kamal Mostafa wrote: > BugLink: https://bugs.launchpad.net/bugs/1840321 > > This reverts commit 00e55d63b41f425b1a67e459064be6fcbce731f5. > > This backport from 4.19-stable is not suitable for 4.15. It breaks > the build if CONFIG_MODVERSIONS is turned on. > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > scripts/genksyms/keywords.c | 4 ---- > scripts/genksyms/parse.y | 2 -- > 2 files changed, 6 deletions(-) > > diff --git a/scripts/genksyms/keywords.c b/scripts/genksyms/keywords.c > index f6956aa41366..9f40bcd17d07 100644 > --- a/scripts/genksyms/keywords.c > +++ b/scripts/genksyms/keywords.c > @@ -24,10 +24,6 @@ static struct resword { > { "__volatile__", VOLATILE_KEYW }, > { "__builtin_va_list", VA_LIST_KEYW }, > > - { "__int128", BUILTIN_INT_KEYW }, > - { "__int128_t", BUILTIN_INT_KEYW }, > - { "__uint128_t", BUILTIN_INT_KEYW }, > - > // According to rth, c99 defines "_Bool", __restrict", __restrict__", "restrict". KAO > { "_Bool", BOOL_KEYW }, > { "_restrict", RESTRICT_KEYW }, > diff --git a/scripts/genksyms/parse.y b/scripts/genksyms/parse.y > index 1ebcf52cd0f9..00a6d7e54971 100644 > --- a/scripts/genksyms/parse.y > +++ b/scripts/genksyms/parse.y > @@ -76,7 +76,6 @@ static void record_compound(struct string_list **keyw, > %token ATTRIBUTE_KEYW > %token AUTO_KEYW > %token BOOL_KEYW > -%token BUILTIN_INT_KEYW > %token CHAR_KEYW > %token CONST_KEYW > %token DOUBLE_KEYW > @@ -264,7 +263,6 @@ simple_type_specifier: > | VOID_KEYW > | BOOL_KEYW > | VA_LIST_KEYW > - | BUILTIN_INT_KEYW > | TYPE { (*$1)->tag = SYM_TYPEDEF; $$ = $1; } > ; > > -- > 2.17.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team Acked-by: Sultan Alsawaf <sultan.alsawaf@canonical.com>
On 8/15/19 7:19 PM, Kamal Mostafa wrote: > BugLink: https://bugs.launchpad.net/bugs/1840321 > > This reverts commit 00e55d63b41f425b1a67e459064be6fcbce731f5. > > This backport from 4.19-stable is not suitable for 4.15. It breaks > the build if CONFIG_MODVERSIONS is turned on. > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > scripts/genksyms/keywords.c | 4 ---- > scripts/genksyms/parse.y | 2 -- > 2 files changed, 6 deletions(-) > > diff --git a/scripts/genksyms/keywords.c b/scripts/genksyms/keywords.c > index f6956aa41366..9f40bcd17d07 100644 > --- a/scripts/genksyms/keywords.c > +++ b/scripts/genksyms/keywords.c > @@ -24,10 +24,6 @@ static struct resword { > { "__volatile__", VOLATILE_KEYW }, > { "__builtin_va_list", VA_LIST_KEYW }, > > - { "__int128", BUILTIN_INT_KEYW }, > - { "__int128_t", BUILTIN_INT_KEYW }, > - { "__uint128_t", BUILTIN_INT_KEYW }, > - > // According to rth, c99 defines "_Bool", __restrict", __restrict__", "restrict". KAO > { "_Bool", BOOL_KEYW }, > { "_restrict", RESTRICT_KEYW }, > diff --git a/scripts/genksyms/parse.y b/scripts/genksyms/parse.y > index 1ebcf52cd0f9..00a6d7e54971 100644 > --- a/scripts/genksyms/parse.y > +++ b/scripts/genksyms/parse.y > @@ -76,7 +76,6 @@ static void record_compound(struct string_list **keyw, > %token ATTRIBUTE_KEYW > %token AUTO_KEYW > %token BOOL_KEYW > -%token BUILTIN_INT_KEYW > %token CHAR_KEYW > %token CONST_KEYW > %token DOUBLE_KEYW > @@ -264,7 +263,6 @@ simple_type_specifier: > | VOID_KEYW > | BOOL_KEYW > | VA_LIST_KEYW > - | BUILTIN_INT_KEYW > | TYPE { (*$1)->tag = SYM_TYPEDEF; $$ = $1; } > ; > > Applied to bionic/master-next branch. Thanks, Kleber
diff --git a/scripts/genksyms/keywords.c b/scripts/genksyms/keywords.c index f6956aa41366..9f40bcd17d07 100644 --- a/scripts/genksyms/keywords.c +++ b/scripts/genksyms/keywords.c @@ -24,10 +24,6 @@ static struct resword { { "__volatile__", VOLATILE_KEYW }, { "__builtin_va_list", VA_LIST_KEYW }, - { "__int128", BUILTIN_INT_KEYW }, - { "__int128_t", BUILTIN_INT_KEYW }, - { "__uint128_t", BUILTIN_INT_KEYW }, - // According to rth, c99 defines "_Bool", __restrict", __restrict__", "restrict". KAO { "_Bool", BOOL_KEYW }, { "_restrict", RESTRICT_KEYW }, diff --git a/scripts/genksyms/parse.y b/scripts/genksyms/parse.y index 1ebcf52cd0f9..00a6d7e54971 100644 --- a/scripts/genksyms/parse.y +++ b/scripts/genksyms/parse.y @@ -76,7 +76,6 @@ static void record_compound(struct string_list **keyw, %token ATTRIBUTE_KEYW %token AUTO_KEYW %token BOOL_KEYW -%token BUILTIN_INT_KEYW %token CHAR_KEYW %token CONST_KEYW %token DOUBLE_KEYW @@ -264,7 +263,6 @@ simple_type_specifier: | VOID_KEYW | BOOL_KEYW | VA_LIST_KEYW - | BUILTIN_INT_KEYW | TYPE { (*$1)->tag = SYM_TYPEDEF; $$ = $1; } ;
BugLink: https://bugs.launchpad.net/bugs/1840321 This reverts commit 00e55d63b41f425b1a67e459064be6fcbce731f5. This backport from 4.19-stable is not suitable for 4.15. It breaks the build if CONFIG_MODVERSIONS is turned on. Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- scripts/genksyms/keywords.c | 4 ---- scripts/genksyms/parse.y | 2 -- 2 files changed, 6 deletions(-)