Changeset 8e7c9fe in mainline for kernel/genarch/include

Timestamp:

2014-09-12T03:45:25Z (11 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)

Location:

kernel/genarch/include/genarch

Files:

• fb/fb.h (modified) (1 diff)
• softint/division.h (modified) (2 diffs)

kernel/genarch/include/genarch/fb/fb.h

@@ -66 +66 @@
 } fb_properties_t;
 
-outdev_t *fb_init(fb_properties_t *props);
+extern outdev_t *fb_init(fb_properties_t *props);
 
 #endif

kernel/genarch/include/genarch/softint/division.h

@@ -36 +36 @@
 #define KERN_DIVISION_H_
 
+#include <cc.h>
+
+#ifdef CONFIG_LTO
+#define DO_NOT_DISCARD ATTRIBUTE_USED
+#else
+#define DO_NOT_DISCARD
+#endif
+
 extern int __divsi3(int, int);
 extern long long __divdi3(long long, long long);
 
 extern unsigned int __udivsi3(unsigned int, unsigned int);
-extern unsigned long long __udivdi3(unsigned long long, unsigned long long);
+extern unsigned long long __udivdi3(unsigned long long, unsigned long long) DO_NOT_DISCARD;
 
 extern int __modsi3(int, int);
@@ -46 +54 @@
 
 extern unsigned int __umodsi3(unsigned int, unsigned int);
-extern unsigned long long __umoddi3(unsigned long long, unsigned long long);
+extern unsigned long long __umoddi3(unsigned long long, unsigned long long) DO_NOT_DISCARD;
 
 extern int __divmodsi3(int, int, int *);