From: David S. Miller <davem@davemloft.net>
Date: Wed, 28 Mar 2012 07:29:20 +0000 (+0200)
Subject: Fix sparc64/elf merge
X-Git-Tag: glibc-2.16-tps~699
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39197fb03fd7fbef8a4ddff6cd93b5b5eb9e24d9;p=platform%2Fupstream%2Fglibc.git

Fix sparc64/elf merge

* sysdeps/sparc/sparc64/Makefile (ASFLAGS-.os): Move before
have-as-vis3 check.
---

diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile
index 8f8a36d..fb00032 100644
--- a/sysdeps/sparc/sparc64/Makefile
+++ b/sysdeps/sparc/sparc64/Makefile
@@ -7,6 +7,9 @@ ifeq ($(subdir),string)
 sysdep_routines += align-cpy
 endif
 
+# The assembler on SPARC needs the -fPIC flag even when it's assembler code.
+ASFLAGS-.os = -fPIC
+
 ifeq ($(have-as-vis3),yes)
 ASFLAGS-.o += -Wa,-Av9d
 ASFLAGS-.os += -Wa,-Av9d
@@ -15,6 +18,3 @@ ASFLAGS-.og += -Wa,-Av9d
 ASFLAGS-.ob += -Wa,-Av9d
 ASFLAGS-.oS += -Wa,-Av9d
 endif
-
-# The assembler on SPARC needs the -fPIC flag even when it's assembler code.
-ASFLAGS-.os = -fPIC