svn commit: trunk/uClibc

[vda at uclibc.org]

Author: vda
Date: 2008-04-29 17:59:05 -0700 (Tue, 29 Apr 2008)
New Revision: 21899

Log:
Rules.mak: fix -falign/-malign mixup



Modified:
   trunk/uClibc/Rules.mak


Changeset:
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2008-04-30 00:58:07 UTC (rev 21898)
+++ trunk/uClibc/Rules.mak	2008-04-30 00:59:05 UTC (rev 21899)
@@ -184,16 +184,16 @@
 	# Generic: no alignment at all (smallest code)
 	GCC_FALIGN=$(call check_gcc,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,-malign-jumps=1 -malign-loops=1)
 ifeq ($(CONFIG_K7),y)
-	# Align functions to four bytes, use default for labels and loops (why?)
-	GCC_FALIGN=$(call check_gcc,-falign-functions=4 -falign-jumps=1,-malign-functions=4 -falign-jumps=1)
+	# Align functions to four bytes, use default for jumps and loops (why?)
+	GCC_FALIGN=$(call check_gcc,-falign-functions=4 -falign-labels=1,-malign-functions=4)
 endif
 ifeq ($(CONFIG_CRUSOE),y)
-	# Use compiler's default for functions, labels and loops (why?)
-	GCC_FALIGN=$(call check_gcc,-falign-functions=0 -falign-jumps=1,-malign-functions=0 -falign-jumps=1)
+	# Use compiler's default for functions, jumps and loops (why?)
+	GCC_FALIGN=$(call check_gcc,-falign-functions=0 -falign-labels=1,-malign-functions=0)
 endif
 ifeq ($(CONFIG_CYRIXIII),y)
-	# Use compiler's default for functions, labels and loops (why?)
-	GCC_FALIGN=$(call check_gcc,-falign-functions=0 -falign-jumps=1,-malign-functions=0 -falign-jumps=1)
+	# Use compiler's default for functions, jumps and loops (why?)
+	GCC_FALIGN=$(call check_gcc,-falign-functions=0 -falign-labels=1,-malign-functions=0)
 endif
 	OPTIMIZATION+=$(GCC_FALIGN)