Index: uspace/lib/c/arch/abs32le/_link.ld.in
===================================================================
--- uspace/lib/c/arch/abs32le/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/abs32le/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -22,4 +22,7 @@
 	. = 0x1000 + SIZEOF_HEADERS;
 #endif
+	
+	/* Make sure the code is aligned reasonably */
+	. = ALIGN(., 16);
 	
 	.text : {
Index: uspace/lib/c/arch/amd64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/amd64/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/amd64/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -23,4 +23,7 @@
 	. = 0x1000 + SIZEOF_HEADERS;
 #endif
+	
+	/* Make sure the code is aligned reasonably */
+	. = ALIGN(., 16);
 	
 	.init : {
Index: uspace/lib/c/arch/arm32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/arm32/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/arm32/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -22,4 +22,7 @@
 	. = 0x1000 + SIZEOF_HEADERS;
 #endif
+	
+	/* Make sure the code is aligned reasonably */
+	. = ALIGN(., 8);
 	
 	.init : {
Index: uspace/lib/c/arch/ia32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ia32/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/ia32/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -31,4 +31,7 @@
 #endif
 	
+	/* Make sure the code is aligned reasonably */
+	. = ALIGN(., 16);
+	
 	.init : {
 		*(.init);
@@ -39,5 +42,5 @@
 		*(.rodata .rodata.*);
 	} :text
-
+	
 #if defined(SHLIB) || defined(DLEXE)
 	.rel.plt : {
@@ -82,12 +85,13 @@
 #if defined(SHLIB) || defined(DLEXE)
 	.data.rel : {
-                *(.data.rel .data.rel.*);
+		*(.data.rel .data.rel.*);
 	} :data
-
+	
 	.got : {
-                *(.got);
+		*(.got);
 	} :data
+	
 	.got.plt : {
-                *(.got.plt);
+		*(.got.plt);
 	} :data
 #endif
Index: uspace/lib/c/arch/ia64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ia64/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/ia64/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -23,8 +23,5 @@
 #endif
 	
-	/*
-	 * XXX This is just a work around. Problem: .init section does not
-	 * have the proper alignment.
-	 */
+	/* Make sure the code is aligned reasonably */
 	. = ALIGN(., 16);
 	
Index: uspace/lib/c/arch/mips32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/mips32/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/mips32/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -22,4 +22,7 @@
 	. = 0x4000 + SIZEOF_HEADERS;
 #endif
+	
+	/* Make sure the code is aligned reasonably */
+	. = ALIGN(., 16);
 	
 	.init : {
Index: uspace/lib/c/arch/mips64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/mips64/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/mips64/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -23,4 +23,7 @@
 	. = 0x4000 + SIZEOF_HEADERS;
 #endif
+	
+	/* Make sure the code is aligned reasonably */
+	. = ALIGN(., 16);
 	
 	.init : {
Index: uspace/lib/c/arch/ppc32/_link.ld.in
===================================================================
--- uspace/lib/c/arch/ppc32/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/ppc32/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -23,4 +23,7 @@
 	. = 0x1000 + SIZEOF_HEADERS;
 #endif
+	
+	/* Make sure the code is aligned reasonably */
+	. = ALIGN(., 4);
 	
 	.init : {
Index: uspace/lib/c/arch/sparc64/_link.ld.in
===================================================================
--- uspace/lib/c/arch/sparc64/_link.ld.in	(revision 31e6aa7f96019cd2ae2a5db2080de342f1a2e8c7)
+++ uspace/lib/c/arch/sparc64/_link.ld.in	(revision 9bcdbc542af346e7ee2aca8b5d53c39f4f87df4e)
@@ -22,4 +22,7 @@
 	. = 0x4000 + SIZEOF_HEADERS;
 #endif
+	
+	/* Make sure the code is aligned reasonably */
+	. = ALIGN(., 16);
 	
 	.init : {