[rtems commit] splinkersets01: Fix declaration

[Chris Johns]

I think this patch has caused a regression in the pc686 PC ...

/opt/work/chris/rtems/nfs/6/lib/gcc/i386-rtems6/10.2.1/../../../../i386-rtems6/bin/ld:
testsuites/sptests/splinkersets01/sets.c.725.o:/opt/work/chris/rtems/nfs/bsps/build/i386/pc686/../../../../../kernel/rtems.git/testsuites/sptests/splinkersets01/splinkersets01.h:38:
multiple definition of `_Linker_set_test_ro_ca2';
testsuites/sptests/splinkersets01/init.c.725.o:/opt/work/chris/rtems/nfs/bsps/build/i386/pc686/../../../../../kernel/rtems.git/testsuites/sptests/splinkersets01/splinkersets01.h:38:
first defined here
/opt/work/chris/rtems/nfs/6/lib/gcc/i386-rtems6/10.2.1/../../../../i386-rtems6/bin/ld:
testsuites/sptests/splinkersets01/items.c.725.o:/opt/work/chris/rtems/nfs/bsps/build/i386/pc686/../../../../../kernel/rtems.git/testsuites/sptests/splinkersets01/splinkersets01.h:38:
multiple definition of `_Linker_set_test_ro_ca2';
testsuites/sptests/splinkersets01/init.c.725.o:/opt/work/chris/rtems/nfs/bsps/build/i386/pc686/../../../../../kernel/rtems.git/testsuites/sptests/splinkersets01/splinkersets01.h:38:
first defined here
collect2: error: ld returned 1 exit status

It is the only recent change in this area.

Chris

On 24/1/21 6:04 am, Sebastian Huber wrote:
> Module:    rtems
> Branch:    master
> Commit:    70c34fb58c1d609010b4d668b7c7527a844ec455
> Changeset: http://git.rtems.org/rtems/commit/?id=70c34fb58c1d609010b4d668b7c7527a844ec455
> 
> Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
> Date:      Sat Jan 23 20:01:43 2021 +0100
> 
> splinkersets01: Fix declaration
> 
> GCC 11 produced warnings like this:
> 
> items.c:21:1: warning: ignoring attribute
> 'section (".rtemsrwset.test_rw.content.0.1")' because it conflicts with
> previous 'section (".rtemsrwset.test_rw.content.1")' [-Wattributes]
> 
> items.c:23:1: warning: ignoring attribute
> 'section (".rtemsroset.test_ro.content.0.OC")' because it conflicts with
> previous 'section (".rtemsroset.test_ro.content.1")' [-Wattributes]
> 
> ---
> 
>  testsuites/sptests/splinkersets01/splinkersets01.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/testsuites/sptests/splinkersets01/splinkersets01.h b/testsuites/sptests/splinkersets01/splinkersets01.h
> index 10b4670..1133fce 100644
> --- a/testsuites/sptests/splinkersets01/splinkersets01.h
> +++ b/testsuites/sptests/splinkersets01/splinkersets01.h
> @@ -33,9 +33,9 @@ RTEMS_LINKER_RWSET_DECLARE(test_content_rw, char);
>  
>  RTEMS_LINKER_ROSET_DECLARE(test_content_ro, char);
>  
> -RTEMS_LINKER_RWSET_ITEM_DECLARE(test_rw, const int *, a1);
> +RTEMS_LINKER_RWSET_ITEM_ORDERED_DECLARE(test_rw, const int *, a1, 1);
>  
> -RTEMS_LINKER_ROSET_ITEM_DECLARE(test_ro, const int *, ca2);
> +RTEMS_LINKER_ROSET_ITEM_ORDERED_DECLARE(test_ro, const int *, ca2, OC);
>  
>  RTEMS_LINKER_RWSET_CONTENT(test_content_rw, extern int content_rw_1);
>  RTEMS_LINKER_RWSET_CONTENT(test_content_rw, extern char content_rw_2);
> 
> _______________________________________________
> vc mailing list
> vc at rtems.org
> http://lists.rtems.org/mailman/listinfo/vc
>