Change data tag to __fstr__ for better filtering in linker script.

Author: mikee47

map.rst

@@ -101,12 +101,12 @@ The macro in the first example above produces a structure like this::
    constexpr const struct {
       ObjectBase object;
       MapPair<int, String> data[2];
-   } fstr_data_intmap PROGMEM = {
+   } __fstr__intmap PROGMEM = {
       {16},
       {35, &content1},
       {180, &content2},
    };
-   const Map<int, String>& intmap = fstr_data_intmap.object.as<Map<int, String>>();
+   const Map<int, String>& intmap = __fstr__intmap.object.as<Map<int, String>>();
 
 Note: ``FSTR::`` namespace qualifier omitted for clarity.
 

src/include/FlashString/Array.hpp

@@ -69,7 +69,7 @@
 	constexpr const struct {                                                                                           \
 		FSTR::ObjectBase object;                                                                                       \
 		ElementType data[sizeof((const ElementType[]){__VA_ARGS__}) / sizeof(ElementType)];                            \
-	} FSTR_PACKED name PROGMEM = {{sizeof(name.data)}, {__VA_ARGS__}};                                                 \
+	} FSTR_PACKED FSTR_ALIGNED name PROGMEM = {{sizeof(name.data)}, {__VA_ARGS__}};                                    \
 	FSTR_CHECK_STRUCT(name);
 
 /**
@@ -82,7 +82,7 @@
  * 	printf("arr[0] = %f, %u elements, buffer is %u bytes\n", arr[0], fsArray.length(), sizeof(arr));
  */
 #define LOAD_FSTR_ARRAY(name, array)                                                                                   \
-	decltype(array)[0] name[(array).size()] __attribute__((aligned(4)));                                               \
+	decltype(array)[0] name[(array).size()] FSTR_ALIGNED;                                                              \
 	memcpy_aligned(name, (array).data(), (array).size());
 
 /**

src/include/FlashString/Map.hpp

@@ -115,7 +115,7 @@
 	constexpr const struct {                                                                                           \
 		FSTR::ObjectBase object;                                                                                       \
 		FSTR::MapPair<KeyType, ContentType> data[size];                                                                \
-	} FSTR_PACKED name PROGMEM = {{sizeof(name.data)}, {__VA_ARGS__}};                                                 \
+	} FSTR_PACKED FSTR_ALIGNED name PROGMEM = {{sizeof(name.data)}, {__VA_ARGS__}};                                    \
 	FSTR_CHECK_STRUCT(name);
 
 namespace FSTR

src/include/FlashString/Object.hpp

@@ -46,7 +46,7 @@
 /**
  * @brief Provide internal name for generated flash string structures
  */
-#define FSTR_DATA_NAME(name) fstr_data_##name
+#define FSTR_DATA_NAME(name) __fstr__##name
 
 /**
  * @brief Given an Object& reference, return a pointer to the actual object

src/include/FlashString/String.hpp

@@ -42,9 +42,8 @@ typedef const __FlashStringHelper* flash_string_t;
  */
 #define FS_PTR(str)                                                                                                    \
 	(__extension__({                                                                                                   \
-		static DEFINE_FSTR_DATA(struc, str);                                                                           \
-		asm("" : : ""(struc));                                                                                         \
-		static_cast<const FSTR::String*>(&struc.object);                                                               \
+		static DEFINE_FSTR_DATA(__fstr__, str);                                                                        \
+		static_cast<const FSTR::String*>(&__fstr__.object);                                                            \
 	}))
 
 /**

src/include/FlashString/config.hpp

@@ -24,4 +24,5 @@
 #include <FakePgmSpace.h>
 
 #define FSTR_INLINE __attribute__((always_inline)) inline
-#define FSTR_PACKED __attribute__((packed)) __attribute__((aligned(4)))
+#define FSTR_ALIGNED __attribute__((aligned(4)))
+#define FSTR_PACKED __attribute__((packed))

vector.rst

@@ -70,14 +70,14 @@ The above example generates a structure like this::
    const struct {
       ObjectBase object;
       String* entries[4];
-   } fstr_data_myTable PROGMEM = {
+   } __fstr__myTable PROGMEM = {
       {16},
       &str1,
       &str2,
       nullptr,
       &str3,
    };
-   const Vector<String>& myTable PROGMEM = fstr_data_myTable.as<Vector<String>>();
+   const Vector<String>& myTable PROGMEM = __fstr__myTable.as<Vector<String>>();
 
 Note: ``FSTR::`` namespace qualifier omitted for clarity.