From 5eb1750adb1c8e2b5cbd7c475d11aa4ef6a2325f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Wed, 13 Sep 2023 10:44:01 +0200
Subject: [PATCH] moved some standard stuff from `avr.cfg` to `std.cfg` (#5421)

---
 cfg/avr.cfg | 29 -----------------------------
 cfg/std.cfg | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/cfg/avr.cfg b/cfg/avr.cfg
index 0efb2d5c7..bb21afac3 100644
--- a/cfg/avr.cfg
+++ b/cfg/avr.cfg
@@ -3,8 +3,6 @@
 <def format="2">
   <!-- stdint.h -->
   <define name="__USING_MINT8" value="0"/>
-  <define name="__CONCATenate(left, right)" value="left ## right"/>
-  <define name="__CONCAT(left, right)" value="__CONCATenate(left, right)"/>
   <!-- Integer types capable of holding object pointers -->
   <podtype name="intptr_t" sign="s" size="2"/>
   <podtype name="uintptr_t" sign="u" size="2"/>
@@ -86,32 +84,8 @@
   <define name="SIG_ATOMIC_MAX" value="INT8_MAX"/>
   <define name="SIG_ATOMIC_MIN" value="INT8_MIN"/>
   <define name="SIZE_MAX" value="(__CONCAT(INT16_MAX, U))"/>
-  <!-- Macros for integer constants -->
-  <define name="INT8_C(value)" value="((int8_t) value)"/>
-  <define name="UINT8_C(value)" value="((uint8_t) __CONCAT(value, U))"/>
-  <define name="INT16_C(value)" value="value"/>
-  <define name="UINT16_C(value)" value="__CONCAT(value, U)"/>
-  <define name="INT32_C(value)" value="__CONCAT(value, L)"/>
-  <define name="UINT32_C(value)" value="__CONCAT(value, UL)"/>
-  <define name="INT64_C(value)" value="__CONCAT(value, LL)"/>
-  <define name="UINT64_C(value)" value="__CONCAT(value, ULL)"/>
-  <define name="INTMAX_C(value)" value="__CONCAT(value, LL)"/>
-  <define name="UINTMAX_C(value)" value="__CONCAT(value, ULL)"/>
   <!-- FIXME: add macros for printf and scanf format specifiers,e.g. PRId8 -->
   <!-- math.h -->
-  <define name="M_E" value="2.7182818284590452354"/>
-  <define name="M_LOG2E" value="1.4426950408889634074"/>
-  <define name="M_LOG10E" value="0.43429448190325182765"/>
-  <define name="M_LN2" value="0.69314718055994530942"/>
-  <define name="M_LN10" value="2.30258509299404568402"/>
-  <define name="M_PI" value="3.14159265358979323846"/>
-  <define name="M_PI_2" value="1.57079632679489661923"/>
-  <define name="M_PI_4" value="0.78539816339744830962"/>
-  <define name="M_1_PI" value="0.31830988618379067154"/>
-  <define name="M_2_PI" value="0.63661977236758134308"/>
-  <define name="M_2_SQRTPI" value="1.12837916709551257390"/>
-  <define name="M_SQRT2" value="1.41421356237309504880"/>
-  <define name="M_SQRT1_2" value="0.70710678118654752440"/>
   <define name="powf" value="pow"/>
   <define name="roundf" value="round"/>
   <define name="signbitf" value="signbit"/>
@@ -137,9 +111,6 @@
   <define name="putchar(__c)" value="fputc(__c, stdout)"/>
   <define name="getc(__stream)" value="fgetc(__stream)"/>
   <define name="getchar()" value="fgetc(stdin)"/>
-  <define name="SEEK_SET" value="0"/>
-  <define name="SEEK_CUR" value="1"/>
-  <define name="SEEK_END" value="2"/>
   <function name="vfprintf_P">
     <noreturn>false</noreturn>
     <leak-ignore/>
diff --git a/cfg/std.cfg b/cfg/std.cfg
index 278bbd871..4e0ac854e 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
 <def format="2">
+  <!-- helpers -->
+  <define name="__CONCATenate(left, right)" value="left ## right"/>
+  <define name="__CONCAT(left, right)" value="__CONCATenate(left, right)"/>
+  <!-- stdint.h -->
   <define name="INT8_MIN" value="-128"/>
   <define name="INT16_MIN" value="-32768"/>
   <define name="INT32_MIN" value="-2147483648"/>
@@ -36,6 +40,18 @@
   <define name="UINT_LEAST16_MAX" value="65535U"/>
   <define name="UINT_LEAST32_MAX" value="4294967295U"/>
   <define name="UINT_LEAST64_MAX" value="18446744073709551615U"/>
+  <!-- Macros for integer constants -->
+  <define name="INT8_C(value)" value="((int8_t) value)"/>
+  <define name="UINT8_C(value)" value="((uint8_t) __CONCAT(value, U))"/>
+  <define name="INT16_C(value)" value="value"/>
+  <define name="UINT16_C(value)" value="__CONCAT(value, U)"/>
+  <define name="INT32_C(value)" value="__CONCAT(value, L)"/>
+  <define name="UINT32_C(value)" value="__CONCAT(value, UL)"/>
+  <define name="INT64_C(value)" value="__CONCAT(value, LL)"/>
+  <define name="UINT64_C(value)" value="__CONCAT(value, ULL)"/>
+  <define name="INTMAX_C(value)" value="__CONCAT(value, LL)"/>
+  <define name="UINTMAX_C(value)" value="__CONCAT(value, ULL)"/>
+  <!-- math.h -->
   <define name="M_E" value="2.7182818284590452354"/>
   <define name="M_LOG2E" value="1.4426950408889634074"/>
   <define name="M_LOG10E" value="0.43429448190325182765"/>