From 39197fb03fd7fbef8a4ddff6cd93b5b5eb9e24d9 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 28 Mar 2012 09:29:20 +0200 Subject: [PATCH] Fix sparc64/elf merge * sysdeps/sparc/sparc64/Makefile (ASFLAGS-.os): Move before have-as-vis3 check. --- sysdeps/sparc/sparc64/Makefile | 6 +++--- 1 file 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 -- 2.43.5