| Message ID | or4kkdh5wt.fsf@lxoliva.fsfla.org |
|---|---|
| State | New |
| Headers | show |
| Series | Fix testsuite/g++.dg/opt/20050511-1.C compilation error on VxWorks 7 | expand |
On Dec 22, 2020, at 1:44 PM, Alexandre Oliva <oliva@adacore.com> wrote: > > In VxWorks 7, UINT32 is defined in both modes, kernel and rtp. Adjust > the work around accordingly. > > Regstrapped on x86_64-linux-gnu, and tested with -x-arm-wrs-vxworks7r2. > Ok to install? Ok.
diff --git a/gcc/testsuite/g++.dg/opt/20050511-1.C b/gcc/testsuite/g++.dg/opt/20050511-1.C index a840fb0db8e38..7041a48200175 100644 --- a/gcc/testsuite/g++.dg/opt/20050511-1.C +++ b/gcc/testsuite/g++.dg/opt/20050511-1.C @@ -5,7 +5,7 @@ #include <stdlib.h> // The VxWorks kernel headers define their own UINT32 -#if defined __vxworks && !defined __RTP__ +#if defined __vxworks #define UINT32 my_UINT32 #endif
In VxWorks 7, UINT32 is defined in both modes, kernel and rtp. Adjust the work around accordingly. Regstrapped on x86_64-linux-gnu, and tested with -x-arm-wrs-vxworks7r2. Ok to install? from Jerome Lambourg <lambourg@adacore.com> for gcc/testsuite/ChangeLog * g++.dg/opt/20050511-1.C: Work around UINT32 in vxworks rtp headers too. --- gcc/testsuite/g++.dg/opt/20050511-1.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)