Changeset 8e7c9fe in mainline for kernel/generic/include/memstr.h

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/generic/include/memstr.h (modified) (2 diffs)

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