about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-28 09:29:20 +0200
committerAndreas Jaeger <jaegerandi@gmail.com>2012-03-28 09:29:20 +0200
commit39197fb03fd7fbef8a4ddff6cd93b5b5eb9e24d9 (patch)
tree8c75a71d7d99523fa7636fca5492f7e6cf34330a
parent8cd23080c4689daed28fee31f38ca4ce5570375d (diff)
downloadglibc-39197fb03fd7fbef8a4ddff6cd93b5b5eb9e24d9.tar.gz
glibc-39197fb03fd7fbef8a4ddff6cd93b5b5eb9e24d9.tar.xz
glibc-39197fb03fd7fbef8a4ddff6cd93b5b5eb9e24d9.zip
Fix sparc64/elf merge
* sysdeps/sparc/sparc64/Makefile (ASFLAGS-.os): Move before
have-as-vis3 check.
-rw-r--r--sysdeps/sparc/sparc64/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile
index 8f8a36da45..fb000329a9 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