[klibc] ARM/Thumb updates and some other minor tweaks

Andre armcc2000 at yahoo.com
Sun Feb 22 12:37:09 PST 2004


"H. Peter Anvin" wrote:
> 
> Could I get you to submit a revised patch?  I think it'll be
> easier for all to read than have .align with a comment for each
> one...

This should apply on top of the others and fix everything in
arch/arm. Maybe the other archs should be brought into line as well
at some stage. e.g. this looks suspicious...

./klibc/arch/ppc64/crt0.S:      .align 3

Andre
--

__________________________________
Do you Yahoo!?
Yahoo! Mail SpamGuard - Read only the mail you want.
http://antispam.yahoo.com/tools
-------------- next part --------------
diff -ruN klibc-0.114_orig/klibc/arch/arm/crt0.S klibc-0.114/klibc/arch/arm/crt0.S
--- klibc-0.114_orig/klibc/arch/arm/crt0.S	2004-02-22 10:56:40.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/crt0.S	2004-02-22 12:23:13.000000000 -0800
@@ -10,7 +10,7 @@
 #
 
 	.text
-	.align 2		@ For ARM, align means align on a 2^n boundary
+	.balign 4
 	.type _start,#function
 	.globl _start
 
diff -ruN klibc-0.114_orig/klibc/arch/arm/exits.S klibc-0.114/klibc/arch/arm/exits.S
--- klibc-0.114_orig/klibc/arch/arm/exits.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/exits.S	2004-02-22 12:24:57.000000000 -0800
@@ -9,7 +9,7 @@
 #include <asm/unistd.h>
 
 	.data
-	.align	2		@ For ARM, align means align on a 2^n boundary
+	.balign	4
 	.globl	__exit_handler
 	.type	__exit_handler,object
 	
@@ -19,7 +19,7 @@
 
 
 	.text
-	.align	2		@ For ARM, align means align on a 2^n boundary
+	.balign	4
 	.globl	exit
 	.type	exit,function
 	.globl	_exit
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/__muldi3.S klibc-0.114/klibc/arch/arm/libgcc/__muldi3.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/__muldi3.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/__muldi3.S	2004-02-22 12:25:41.000000000 -0800
@@ -11,7 +11,7 @@
 #
 
 	.text
-	.align  2		@ For ARM, align means align on a 2^n boundary
+	.balign	4
 	.globl  __muldi3
 	.type 	__muldi3,function
 
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_fp.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_fp.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_fp.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_fp.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_fp
 	.type	_call_via_fp,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_ip.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_ip.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_ip.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_ip.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_ip
 	.type	_call_via_ip,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_lr.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_lr.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_lr.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_lr.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_lr
 	.type	_call_via_lr,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r0.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r0.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r0.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r0.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r0
 	.type	_call_via_r0,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r1.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r1.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r1.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r1.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r1
 	.type	_call_via_r1,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r2.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r2.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r2.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r2.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r2
 	.type	_call_via_r2,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r3.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r3.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r3.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r3.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r3
 	.type	_call_via_r3,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r4.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r4.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r4.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r4.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r4
 	.type	_call_via_r4,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r5.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r5.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r5.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r5.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r5
 	.type	_call_via_r5,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r6.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r6.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r6.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r6.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r6
 	.type	_call_via_r6,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r7.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r7.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r7.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r7.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r7
 	.type	_call_via_r7,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r8.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r8.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r8.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r8.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r8
 	.type	_call_via_r8,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r9.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_r9.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_r9.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_r9.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_r9
 	.type	_call_via_r9,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_sl.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_sl.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_sl.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_sl.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_sl
 	.type	_call_via_sl,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_sp.S klibc-0.114/klibc/arch/arm/libgcc/_call_via_sp.S
--- klibc-0.114_orig/klibc/arch/arm/libgcc/_call_via_sp.S	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/_call_via_sp.S	2004-02-22 12:26:18.000000000 -0800
@@ -5,7 +5,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_sp
 	.type	_call_via_sp,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/libgcc/generate_call_via_rX.sh klibc-0.114/klibc/arch/arm/libgcc/generate_call_via_rX.sh
--- klibc-0.114_orig/klibc/arch/arm/libgcc/generate_call_via_rX.sh	2004-02-22 10:56:43.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/libgcc/generate_call_via_rX.sh	2004-02-22 12:26:08.000000000 -0800
@@ -13,7 +13,7 @@
 #
 
 	.text
-	.align	1		@ For ARM, align means align on a 2^n boundary
+	.balign	2
 	.globl	_call_via_rX
 	.type	_call_via_rX,function
 	.thumb_func
diff -ruN klibc-0.114_orig/klibc/arch/arm/setjmp-arm.S klibc-0.114/klibc/arch/arm/setjmp-arm.S
--- klibc-0.114_orig/klibc/arch/arm/setjmp-arm.S	2004-02-22 10:56:40.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/setjmp-arm.S	2004-02-22 12:24:11.000000000 -0800
@@ -19,7 +19,7 @@
 #
 
 	.text
-	.align 2		@ For ARM, align means align on a 2^n boundary
+	.balign 4
 	.globl setjmp
 	.type setjmp, #function
 setjmp:
@@ -29,7 +29,7 @@
 	.size setjmp,.-setjmp
 
 	.text
-	.align 2		@ For ARM, align means align on a 2^n boundary
+	.balign 4
 	.globl longjmp
 	.type longjmp, #function
 longjmp:
diff -ruN klibc-0.114_orig/klibc/arch/arm/setjmp-thumb.S klibc-0.114/klibc/arch/arm/setjmp-thumb.S
--- klibc-0.114_orig/klibc/arch/arm/setjmp-thumb.S	2004-02-22 10:56:40.000000000 -0800
+++ klibc-0.114/klibc/arch/arm/setjmp-thumb.S	2004-02-22 12:23:53.000000000 -0800
@@ -19,7 +19,7 @@
 #
 
 	.text
-	.align 1		@ For ARM, align means align on a 2^n boundary
+	.balign 2
 	.globl setjmp
 	.type setjmp, #function
 	.thumb_func
@@ -37,7 +37,7 @@
 	.size setjmp,.-setjmp
 
 	.text
-	.align 1		@ For ARM, align means align on a 2^n boundary
+	.balign 2
 	.globl longjmp
 	.type longjmp, #function
 	.thumb_func


More information about the klibc mailing list