Index: uspace/lib/softint/generic/comparison.c
===================================================================
--- uspace/lib/softint/generic/comparison.c	(revision aec41c815c786936ee5edb382011403392833e23)
+++ uspace/lib/softint/generic/comparison.c	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -34,5 +34,4 @@
  */
 
-#include <alias.h>
 #include <comparison.h>
 #include <lltype.h>
@@ -42,5 +41,5 @@
 #define GREATER 2;
 
-int __cmpti2 (long long a, long long b)
+int __cmpdi2 (long long a, long long b)
 {
 	union lltype lla;
@@ -65,5 +64,5 @@
 }
 
-int __ucmpti2 (unsigned long long a, unsigned long long b)
+int __ucmpdi2 (unsigned long long a, unsigned long long b)
 {
 	union lltype lla;
@@ -88,33 +87,4 @@
 }
 
-#if LONG_MAX == LLONG_MAX
-int ALIAS(__cmp, i2);
-int ALIAS(__ucmp, i2);
-#else
-
-int __cmpdi2(long a, long b)
-{
-	if ((int)a < (int)b) {
-		return LESSER;
-	} else if ((int)a > (int)b) {
-		return GREATER;
-	} else {
-		return EQUAL;
-	}
-}
-
-int __ucmpdi2(unsigned long a, unsigned long b)
-{
-	if ((int)a < (int)b) {
-		return LESSER;
-	} else if ((int)a > (int)b) {
-		return GREATER;
-	} else {
-		return EQUAL;
-	}
-}
-
-#endif
-
 /** @}
  */
Index: uspace/lib/softint/generic/division.c
===================================================================
--- uspace/lib/softint/generic/division.c	(revision aec41c815c786936ee5edb382011403392833e23)
+++ uspace/lib/softint/generic/division.c	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -35,5 +35,4 @@
  */
 
-#include <alias.h>
 #include <division.h>
 
@@ -122,5 +121,5 @@
 
 /* 64bit integer division */
-long long __divti3(long long a, long long b)
+long long __divdi3(long long a, long long b)
 {
 	unsigned long long rem;
@@ -141,5 +140,5 @@
 
 /* 64bit unsigned integer division */
-unsigned long long __udivti3(unsigned long long a, unsigned long long b)
+unsigned long long __udivdi3(unsigned long long a, unsigned long long b)
 {
 	unsigned long long rem;
@@ -161,5 +160,5 @@
 
 /* 64bit remainder of the signed division */
-long long __modti3(long long a, long long b)
+long long __moddi3(long long a, long long b)
 {
 	unsigned long long rem;
@@ -182,5 +181,5 @@
 
 /* 64bit remainder of the unsigned division */
-unsigned long long __umodti3(unsigned long long a, unsigned long long b)
+unsigned long long __umoddi3(unsigned long long a, unsigned long long b)
 {
 	unsigned long long rem;
@@ -203,9 +202,4 @@
 }
 
-int __divmodsi4(int a, int b, int *c)
-{
-	return __divmodsi3(a, b, c);
-}
-
 unsigned int __udivmodsi3(unsigned int a, unsigned int b,
     unsigned int *c)
@@ -214,11 +208,5 @@
 }
 
-unsigned int __udivmodsi4(unsigned int a, unsigned int b,
-    unsigned int *c)
-{
-	return divandmod32(a, b, c);
-}
-
-long long __divmodti3(long long a, long long b, long long *c)
+long long __divmoddi3(long long a, long long b, long long *c)
 {
 	unsigned long long rem;
@@ -234,6 +222,5 @@
 }
 
-
-long long __divmodti4(long long a, long long b, long long *c)
+long long __divmoddi4(long long a, long long b, long long *c)
 {
 	unsigned long long rem;
@@ -249,5 +236,5 @@
 }
 
-unsigned long long __udivmodti3(unsigned long long a, unsigned long long b,
+unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b,
     unsigned long long *c)
 {
@@ -255,18 +242,9 @@
 }
 
-unsigned long long __udivmodti4(unsigned long long a, unsigned long long b,
+unsigned long long __udivmoddi4(unsigned long long a, unsigned long long b,
     unsigned long long *c)
 {
 	return divandmod64(a, b, c);
 }
-
-long ALIAS(__div, i3);
-long ALIAS(__mod, i3);
-long ALIAS(__divmod, i3);
-long ALIAS(__divmod, i4);
-unsigned long ALIAS(__udiv, i3);
-unsigned long ALIAS(__umod, i3);
-unsigned long ALIAS(__udivmod, i3);
-unsigned long ALIAS(__udivmod, i4);
 
 /** @}
Index: uspace/lib/softint/generic/multiplication.c
===================================================================
--- uspace/lib/softint/generic/multiplication.c	(revision aec41c815c786936ee5edb382011403392833e23)
+++ uspace/lib/softint/generic/multiplication.c	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -35,5 +35,4 @@
  */
 
-#include <alias.h>
 #include <multiplication.h>
 #include <stdint.h>
@@ -68,5 +67,5 @@
  *
  */
-long long __multi3 (long long a, long long b)
+long long __muldi3 (long long a, long long b)
 {
 	char neg = 0;
@@ -121,13 +120,4 @@
 }
 
-#if LONG_MAX == LLONG_MAX
-long ALIAS(__mul, i3);
-#else
-long __muldi3(long a, long b)
-{
-	return (int)a * (int)b;
-}
-#endif
-
 /** @}
  */
Index: uspace/lib/softint/generic/shift.c
===================================================================
--- uspace/lib/softint/generic/shift.c	(revision aec41c815c786936ee5edb382011403392833e23)
+++ uspace/lib/softint/generic/shift.c	(revision e0f47f53448ea5824cda6d06a7b34f8d2d74c41e)
@@ -34,9 +34,8 @@
  */
 
-#include <alias.h>
 #include <shift.h>
 #include <lltype.h>
 
-long long __ashlti3 (long long val, int shift)
+long long __ashldi3 (long long val, int shift)
 {
 	union lltype ll;
@@ -66,5 +65,5 @@
 }
 
-long long __ashrti3 (long long val, int shift)
+long long __ashrdi3 (long long val, int shift)
 {
 	union lltype ll;
@@ -96,5 +95,5 @@
 }
 
-long long __lshrti3 (long long val, int shift)
+long long __lshrdi3 (long long val, int shift)
 {
 	union lltype ll;
@@ -126,34 +125,11 @@
 long long __aeabi_llsl(long long val, int shift)
 {
-	return __ashlti3(val, shift);
+	return __ashldi3(val, shift);
 }
 
 long long __aeabi_llsr(long long val, int shift)
 {
-	return __lshrti3(val, shift);
+	return __lshrdi3(val, shift);
 }
-
-#if LONG_MAX == LLONG_MAX
-long ALIAS(__ashl, i3);
-long ALIAS(__ashr, i3);
-long ALIAS(__lshr, i3);
-#else
-
-long __ashldi3(long val, int shift)
-{
-	return ((int) val) << shift;
-}
-
-long __ashrdi3(long val, int shift)
-{
-	return ((int) val) >> shift;
-}
-
-long __lshrdi3(long val, int shift)
-{
-	return ((unsigned int) val) >> shift;
-}
-
-#endif
 
 /** @}