[PATCH] [vxworks] avoid mangling __STDC_VERSION_LIMITS_H__

[PATCH] [vxworks] avoid mangling __STDC_VERSION_LIMITS_H__

[Alexandre Oliva]

The mangling of the macro name that guards limits.h from reinclusion
was mangling a c23-required macro as well.  Make the edit pattern
stricter.

Regstrapped on x86_64-linux-gnu.  Also tested with gcc-13 on arm-,
aarch64-, x86- and x86_64-vxworks7r2.  Ok to install?


for  gcc/ChangeLog

	* config/t-vxworks (vxw-glimits.h): Don't mangle c23-required
	__STDC_VERSION_LIMITS_H__ define.
---
 gcc/config/t-vxworks |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/config/t-vxworks b/gcc/config/t-vxworks
index b89350c3c70f4..6063943e346e6 100644
--- a/gcc/config/t-vxworks
+++ b/gcc/config/t-vxworks
@@ -57,7 +57,7 @@ T_GLIMITS_H = vxw-glimits.h
 
 vxw-glimits.h: $(srcdir)/glimits.h
 	ID=`echo $(BASEVER_c) | sed -e 's/\./_/g'` && \
-	sed -e "s/_LIMITS_H__/_LIMITS_H__$${ID}_/" < $< > $@T
+	sed -e "s/_LIMITS_H___/_LIMITS_H__$${ID}_/" < $< > $@T
 	mv $@T $@
 
 # Arrange to "provide" a tailored version of stdint-gcc.h

-- 
Alexandre Oliva, happy hacker            https://FSFLA.org/blogs/lxo/
   Free Software Activist                   GNU Toolchain Engineer
More tolerance and less prejudice are key for inclusion and diversity
Excluding neuro-others for not behaving ""normal"" is *not* inclusive

Re: [PATCH] [vxworks] avoid mangling __STDC_VERSION_LIMITS_H__

[Olivier Hainque]

> On 16 Apr 2024, at 05:27, Alexandre Oliva <oliva@adacore.com> wrote:
> 
> 
> The mangling of the macro name that guards limits.h from reinclusion
> was mangling a c23-required macro as well.  Make the edit pattern
> stricter.
> 
> Regstrapped on x86_64-linux-gnu.  Also tested with gcc-13 on arm-,
> aarch64-, x86- and x86_64-vxworks7r2.  Ok to install?

Ok, thanks Alex.

Olivier

> for  gcc/ChangeLog
> 
> 	* config/t-vxworks (vxw-glimits.h): Don't mangle c23-required
> 	__STDC_VERSION_LIMITS_H__ define.
> ---
> gcc/config/t-vxworks |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gcc/config/t-vxworks b/gcc/config/t-vxworks
> index b89350c3c70f4..6063943e346e6 100644
> --- a/gcc/config/t-vxworks
> +++ b/gcc/config/t-vxworks
> @@ -57,7 +57,7 @@ T_GLIMITS_H = vxw-glimits.h
> 
> vxw-glimits.h: $(srcdir)/glimits.h
> 	ID=`echo $(BASEVER_c) | sed -e 's/\./_/g'` && \
> -	sed -e "s/_LIMITS_H__/_LIMITS_H__$${ID}_/" < $< > $@T
> +	sed -e "s/_LIMITS_H___/_LIMITS_H__$${ID}_/" < $< > $@T
> 	mv $@T $@
> 
> # Arrange to "provide" a tailored version of stdint-gcc.h
> 
> -- 
> Alexandre Oliva, happy hacker            https://FSFLA.org/blogs/lxo/
>   Free Software Activist                   GNU Toolchain Engineer
> More tolerance and less prejudice are key for inclusion and diversity
> Excluding neuro-others for not behaving ""normal"" is *not* inclusive