Changeset 630b9d35 in mainline

Timestamp:

2014-04-21T11:19:29Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

170e181

Parents:

5792d6e

Message:

Unbreak link-time-optimization builds

Apparently, newer version of GCC discards more functions that it
is supposed to and thus it is necessary to explicitly say that
memset & co implementations shall not be discarded.

Location:

kernel/generic/include

Files:

• cc.h (modified) (1 diff)
• lib/memfnc.h (modified) (1 diff)
• memstr.h (modified) (2 diffs)

kernel/generic/include/cc.h

@@ -40 +40 @@
 #define ATTRIBUTE_OPTIMIZE(opt) \
         __attribute__ ((optimize(opt)))
+#define ATTRIBUTE_USED \
+        __attribute__ ((used))
 #else
 #define ATTRIBUTE_OPTIMIZE(opt)
+#define ATTRIBUTE_USED
 #endif
 

kernel/generic/include/lib/memfnc.h

@@ -39 +39 @@
 #include <cc.h>
 
+#ifdef CONFIG_LTO
+#define DO_NOT_DISCARD ATTRIBUTE_USED
+#else
+#define DO_NOT_DISCARD
+#endif
+
 extern void *memset(void *, int, size_t)
-    ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns");
+    ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns") DO_NOT_DISCARD;
 extern void *memcpy(void *, const void *, size_t)
-    ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns");
+    ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns") DO_NOT_DISCARD;
 
 #endif

kernel/generic/include/memstr.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <cc.h>
+
+#ifdef CONFIG_LTO
+#define DO_NOT_DISCARD ATTRIBUTE_USED
+#else
+#define DO_NOT_DISCARD
+#endif
 
 #define memset(dst, val, cnt)  __builtin_memset((dst), (val), (cnt))
@@ -43 +50 @@
 extern void memsetb(void *, size_t, uint8_t);
 extern void memsetw(void *, size_t, uint16_t);
-extern void *memmove(void *, const void *, size_t);
+extern void *memmove(void *, const void *, size_t) DO_NOT_DISCARD;
 
 #endif