[PATCH] Coccinelle: remove incorrect -include option transformation

[PATCH] Coccinelle: remove incorrect -include option transformation

[Andrzej Hajda]

kbuild/gcc uses -include option to include files and -I to provide paths for
#include <> directive. The same is true for spatch.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 scripts/coccicheck | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/coccicheck b/scripts/coccicheck
index bbf901a..6d84b05 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -30,7 +30,6 @@ FLAGS="$SPFLAGS --very-quiet"
 # spatch only allows include directories with the syntax "-I include"
 # while gcc also allows "-Iinclude" and "-include include"
 COCCIINCLUDE=${LINUXINCLUDE//-I/-I }
-COCCIINCLUDE=${COCCIINCLUDE//-include/-I}
 
 if [ "$C" = "1" -o "$C" = "2" ]; then
     ONLINE=1
-- 
1.9.1

Re: [PATCH] Coccinelle: remove incorrect -include option transformation

[Julia Lawall]

On Tue, 22 Sep 2015, Andrzej Hajda wrote:

> kbuild/gcc uses -include option to include files and -I to provide paths for
> #include <> directive. The same is true for spatch.
>
> Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
> ---
>  scripts/coccicheck | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/scripts/coccicheck b/scripts/coccicheck
> index bbf901a..6d84b05 100755
> --- a/scripts/coccicheck
> +++ b/scripts/coccicheck
> @@ -30,7 +30,6 @@ FLAGS="$SPFLAGS --very-quiet"
>  # spatch only allows include directories with the syntax "-I include"
>  # while gcc also allows "-Iinclude" and "-include include"
>  COCCIINCLUDE=${LINUXINCLUDE//-I/-I }
> -COCCIINCLUDE=${COCCIINCLUDE//-include/-I}

I'm not sure of the meaning of the above notation, nor what is the
intention.  Coccinelle does have a --include option, but it doesn't mean
the same thing as -I.  It is a way to have a file be included that is not
included according to the normal inclusion strategy.  For example, if a.h
includes b.h which includes c.h, and if one considers that c.h is really
important for having the right type information, but one doesn't want the
cost of including everything via --recursive-includes, then one could put
--include c.h.

julia


>
>  if [ "$C" = "1" -o "$C" = "2" ]; then
>      ONLINE=1
> --
> 1.9.1
>
>

Re: [PATCH] Coccinelle: remove incorrect -include option transformation

[Julia Lawall]

On Tue, 22 Sep 2015, Andrzej Hajda wrote:

> kbuild/gcc uses -include option to include files and -I to provide paths for
> #include <> directive. The same is true for spatch.

Nicolas, if you think this is OK, please ack it.

thanks,
julia

> Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
> ---
>  scripts/coccicheck | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/scripts/coccicheck b/scripts/coccicheck
> index bbf901a..6d84b05 100755
> --- a/scripts/coccicheck
> +++ b/scripts/coccicheck
> @@ -30,7 +30,6 @@ FLAGS="$SPFLAGS --very-quiet"
>  # spatch only allows include directories with the syntax "-I include"
>  # while gcc also allows "-Iinclude" and "-include include"
>  COCCIINCLUDE=${LINUXINCLUDE//-I/-I }
> -COCCIINCLUDE=${COCCIINCLUDE//-include/-I}
>
>  if [ "$C" = "1" -o "$C" = "2" ]; then
>      ONLINE=1
> --
> 1.9.1
>
>

Re: [PATCH] Coccinelle: remove incorrect -include option transformation

[Andrzej Hajda]

On 09/22/2015 02:58 PM, Julia Lawall wrote:
>
> On Tue, 22 Sep 2015, Andrzej Hajda wrote:
>
>> kbuild/gcc uses -include option to include files and -I to provide paths for
>> #include <> directive. The same is true for spatch.
>>
>> Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
>> ---
>>  scripts/coccicheck | 1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/scripts/coccicheck b/scripts/coccicheck
>> index bbf901a..6d84b05 100755
>> --- a/scripts/coccicheck
>> +++ b/scripts/coccicheck
>> @@ -30,7 +30,6 @@ FLAGS="$SPFLAGS --very-quiet"
>>  # spatch only allows include directories with the syntax "-I include"
>>  # while gcc also allows "-Iinclude" and "-include include"
>>  COCCIINCLUDE=${LINUXINCLUDE//-I/-I }
>> -COCCIINCLUDE=${COCCIINCLUDE//-include/-I}
> I'm not sure of the meaning of the above notation, nor what is the
> intention.  Coccinelle does have a --include option, but it doesn't mean
> the same thing as -I.  It is a way to have a file be included that is not
> included according to the normal inclusion strategy.  For example, if a.h
> includes b.h which includes c.h, and if one considers that c.h is really
> important for having the right type information, but one doesn't want the
> cost of including everything via --recursive-includes, then one could put
> --include c.h.

This option has the same meaning for gcc.
But the patch is incorrect. It should be:

COCCIINCLUDE=${COCCIINCLUDE// -include/ --include}

gcc option '-include' should be converted to spatch option '--include',
ie one minus should be added.

Regards
Andrzej


>
> julia
>
>
>>  if [ "$C" = "1" -o "$C" = "2" ]; then
>>      ONLINE=1
>> --
>> 1.9.1
>>
>>

[PATCH v2] Coccinelle: fix incorrect -include option transformation

[Andrzej Hajda]

kbuild/gcc uses -include option to include files and -I to provide paths for
#include <> directive. In case of spatch latter option should be prefixed with
two -.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 scripts/coccicheck | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/coccicheck b/scripts/coccicheck
index bbf901a..b2d75818 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -30,7 +30,7 @@ FLAGS="$SPFLAGS --very-quiet"
 # spatch only allows include directories with the syntax "-I include"
 # while gcc also allows "-Iinclude" and "-include include"
 COCCIINCLUDE=${LINUXINCLUDE//-I/-I }
-COCCIINCLUDE=${COCCIINCLUDE//-include/-I}
+COCCIINCLUDE=${COCCIINCLUDE// -include/ --include}
 
 if [ "$C" = "1" -o "$C" = "2" ]; then
     ONLINE=1
-- 
1.9.1

Re: [PATCH] Coccinelle: remove incorrect -include option transformation

[Julia Lawall]

On Tue, 22 Sep 2015, Andrzej Hajda wrote:

> On 09/22/2015 02:58 PM, Julia Lawall wrote:
> >
> > On Tue, 22 Sep 2015, Andrzej Hajda wrote:
> >
> >> kbuild/gcc uses -include option to include files and -I to provide paths for
> >> #include <> directive. The same is true for spatch.
> >>
> >> Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
> >> ---
> >>  scripts/coccicheck | 1 -
> >>  1 file changed, 1 deletion(-)
> >>
> >> diff --git a/scripts/coccicheck b/scripts/coccicheck
> >> index bbf901a..6d84b05 100755
> >> --- a/scripts/coccicheck
> >> +++ b/scripts/coccicheck
> >> @@ -30,7 +30,6 @@ FLAGS="$SPFLAGS --very-quiet"
> >>  # spatch only allows include directories with the syntax "-I include"
> >>  # while gcc also allows "-Iinclude" and "-include include"
> >>  COCCIINCLUDE=${LINUXINCLUDE//-I/-I }
> >> -COCCIINCLUDE=${COCCIINCLUDE//-include/-I}
> > I'm not sure of the meaning of the above notation, nor what is the
> > intention.  Coccinelle does have a --include option, but it doesn't mean
> > the same thing as -I.  It is a way to have a file be included that is not
> > included according to the normal inclusion strategy.  For example, if a.h
> > includes b.h which includes c.h, and if one considers that c.h is really
> > important for having the right type information, but one doesn't want the
> > cost of including everything via --recursive-includes, then one could put
> > --include c.h.
>
> This option has the same meaning for gcc.
> But the patch is incorrect. It should be:
>
> COCCIINCLUDE=${COCCIINCLUDE// -include/ --include}
>
> gcc option '-include' should be converted to spatch option '--include',
> ie one minus should be added.

OK, do you want to submit a patch for that?

thanks,
julia

>
> Regards
> Andrzej
>
>
> >
> > julia
> >
> >
> >>  if [ "$C" = "1" -o "$C" = "2" ]; then
> >>      ONLINE=1
> >> --
> >> 1.9.1
> >>
> >>
>
>

Re: [PATCH v2] Coccinelle: fix incorrect -include option transformation

[Julia Lawall]

On Tue, 22 Sep 2015, Andrzej Hajda wrote:

> kbuild/gcc uses -include option to include files and -I to provide paths for
> #include <> directive. In case of spatch latter option should be prefixed with
> two -.

Acked-by: Julia Lawall <julia.lawall@lip6.fr

Thanks!

julia

>
> Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
> ---
>  scripts/coccicheck | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/coccicheck b/scripts/coccicheck
> index bbf901a..b2d75818 100755
> --- a/scripts/coccicheck
> +++ b/scripts/coccicheck
> @@ -30,7 +30,7 @@ FLAGS="$SPFLAGS --very-quiet"
>  # spatch only allows include directories with the syntax "-I include"
>  # while gcc also allows "-Iinclude" and "-include include"
>  COCCIINCLUDE=${LINUXINCLUDE//-I/-I }
> -COCCIINCLUDE=${COCCIINCLUDE//-include/-I}
> +COCCIINCLUDE=${COCCIINCLUDE// -include/ --include}
>
>  if [ "$C" = "1" -o "$C" = "2" ]; then
>      ONLINE=1
> --
> 1.9.1
>
>

Re: [PATCH v2] Coccinelle: fix incorrect -include option transformation

[Michal Marek]

Dne 22.9.2015 v 15:27 Julia Lawall napsal(a):
> On Tue, 22 Sep 2015, Andrzej Hajda wrote:
> 
>> kbuild/gcc uses -include option to include files and -I to provide paths for
>> #include <> directive. In case of spatch latter option should be prefixed with

That hash sign in the comment was not nice :).


>> two -.
> 
> Acked-by: Julia Lawall <julia.lawall@lip6.fr

Applied to kbuild.git#misc.

Michal