[1/2] RISC-V: remove deprecate pic code model macro

Message ID 20220830174830.224541-2-vineetg@rivosinc.com
State New, archived
Headers
Series PIC cleanup |

Commit Message

Vineet Gupta Aug. 30, 2022, 5:48 p.m. UTC
  Came across this deprecated symbol when looking around for
-mexplicit-relocs handling in code

Signed-off-by: Vineet Gupta <vineetg@rivosinc.com>
---
 gcc/config/riscv/riscv-c.cc | 3 ---
 1 file changed, 3 deletions(-)
  

Comments

Palmer Dabbelt Aug. 31, 2022, 2:57 p.m. UTC | #1
On Tue, 30 Aug 2022 10:48:29 PDT (-0700), Vineet Gupta wrote:
> Came across this deprecated symbol when looking around for
> -mexplicit-relocs handling in code
>
> Signed-off-by: Vineet Gupta <vineetg@rivosinc.com>
> ---
>  gcc/config/riscv/riscv-c.cc | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/gcc/config/riscv/riscv-c.cc b/gcc/config/riscv/riscv-c.cc
> index eb7ef09297e9..bba72cf77a82 100644
> --- a/gcc/config/riscv/riscv-c.cc
> +++ b/gcc/config/riscv/riscv-c.cc
> @@ -93,9 +93,6 @@ riscv_cpu_cpp_builtins (cpp_reader *pfile)
>        break;
>
>      case CM_PIC:
> -      /* __riscv_cmodel_pic is deprecated, and will removed in next GCC release.
> -	 see https://github.com/riscv/riscv-c-api-doc/pull/11  */
> -      builtin_define ("__riscv_cmodel_pic");
>        /* FALLTHROUGH. */
>
>      case CM_MEDANY:

It looks like some of the tests
(gcc/testsuite/gcc.target/riscv/predef-3.c, for example) are checking
for __riscv_cmodel_pic.  From looking at them I'd expect them to fail,
but even if they're not we should clean them up.
  
Kito Cheng Aug. 31, 2022, 3:35 p.m. UTC | #2
Could you also clean up all __riscv_cmodel_pic checking in
gcc/testsuite/gcc.target/riscv/predef-*.c?

On Wed, Aug 31, 2022 at 10:58 PM Palmer Dabbelt <palmer@rivosinc.com> wrote:
>
> On Tue, 30 Aug 2022 10:48:29 PDT (-0700), Vineet Gupta wrote:
> > Came across this deprecated symbol when looking around for
> > -mexplicit-relocs handling in code
> >
> > Signed-off-by: Vineet Gupta <vineetg@rivosinc.com>
> > ---
> >  gcc/config/riscv/riscv-c.cc | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/gcc/config/riscv/riscv-c.cc b/gcc/config/riscv/riscv-c.cc
> > index eb7ef09297e9..bba72cf77a82 100644
> > --- a/gcc/config/riscv/riscv-c.cc
> > +++ b/gcc/config/riscv/riscv-c.cc
> > @@ -93,9 +93,6 @@ riscv_cpu_cpp_builtins (cpp_reader *pfile)
> >        break;
> >
> >      case CM_PIC:
> > -      /* __riscv_cmodel_pic is deprecated, and will removed in next GCC release.
> > -      see https://github.com/riscv/riscv-c-api-doc/pull/11  */
> > -      builtin_define ("__riscv_cmodel_pic");
> >        /* FALLTHROUGH. */
> >
> >      case CM_MEDANY:
>
> It looks like some of the tests
> (gcc/testsuite/gcc.target/riscv/predef-3.c, for example) are checking
> for __riscv_cmodel_pic.  From looking at them I'd expect them to fail,
> but even if they're not we should clean them up.
  
Vineet Gupta Aug. 31, 2022, 8:36 p.m. UTC | #3
On 8/31/22 07:57, Palmer Dabbelt wrote:
> On Tue, 30 Aug 2022 10:48:29 PDT (-0700), Vineet Gupta wrote:
>> Came across this deprecated symbol when looking around for
>> -mexplicit-relocs handling in code
>>
>> Signed-off-by: Vineet Gupta <vineetg@rivosinc.com>
>> ---
>>  gcc/config/riscv/riscv-c.cc | 3 ---
>>  1 file changed, 3 deletions(-)
>>
>> diff --git a/gcc/config/riscv/riscv-c.cc b/gcc/config/riscv/riscv-c.cc
>> index eb7ef09297e9..bba72cf77a82 100644
>> --- a/gcc/config/riscv/riscv-c.cc
>> +++ b/gcc/config/riscv/riscv-c.cc
>> @@ -93,9 +93,6 @@ riscv_cpu_cpp_builtins (cpp_reader *pfile)
>>        break;
>>
>>      case CM_PIC:
>> -      /* __riscv_cmodel_pic is deprecated, and will removed in next 
>> GCC release.
>> -     see https://github.com/riscv/riscv-c-api-doc/pull/11  */
>> -      builtin_define ("__riscv_cmodel_pic");
>>        /* FALLTHROUGH. */
>>
>>      case CM_MEDANY:
>
> It looks like some of the tests
> (gcc/testsuite/gcc.target/riscv/predef-3.c, for example) are checking
> for __riscv_cmodel_pic.  From looking at them I'd expect them to fail,
> but even if they're not we should clean them up.

Aah, I did miss removing them and looks like there was a snafu in my 
test setup as well.
I'm rerunning the tests with the fix and will post a v2 after tests come 
out clean.

Thx,
-Vineet
  

Patch

diff --git a/gcc/config/riscv/riscv-c.cc b/gcc/config/riscv/riscv-c.cc
index eb7ef09297e9..bba72cf77a82 100644
--- a/gcc/config/riscv/riscv-c.cc
+++ b/gcc/config/riscv/riscv-c.cc
@@ -93,9 +93,6 @@  riscv_cpu_cpp_builtins (cpp_reader *pfile)
       break;
 
     case CM_PIC:
-      /* __riscv_cmodel_pic is deprecated, and will removed in next GCC release.
-	 see https://github.com/riscv/riscv-c-api-doc/pull/11  */
-      builtin_define ("__riscv_cmodel_pic");
       /* FALLTHROUGH. */
 
     case CM_MEDANY: