aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-28 14:25:42 -0700
committerDavid S. Miller <davem@davemloft.net>2012-03-28 14:25:42 -0700
commit18c9d62b9c575a54f26ca5aebeb03dd7322fc180 (patch)
treeb2f22597956c015e5259cb947de32056281da4b6
parentfb289bde9a171c5f7fbcd1230018562dc0bd8ded (diff)
downloadglibc-18c9d62b9c575a54f26ca5aebeb03dd7322fc180.tar
glibc-18c9d62b9c575a54f26ca5aebeb03dd7322fc180.tar.gz
glibc-18c9d62b9c575a54f26ca5aebeb03dd7322fc180.tar.bz2
glibc-18c9d62b9c575a54f26ca5aebeb03dd7322fc180.zip
Make sparc's -fPIC addition to ASFLAGS-.os more robust.
* sysdeps/sparc/Makefile: Add -fPIC to ASFLAGS-.os here.... * sysdeps/sparc/sparc32/Makefile: rather than here... * sysdeps/sparc/sparc64/Makefile: and here.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/sparc/Makefile3
-rw-r--r--sysdeps/sparc/sparc32/Makefile3
-rw-r--r--sysdeps/sparc/sparc64/Makefile3
4 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 03b77954b3..9069eb338f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-28 David S. Miller <davem@davemloft.net>
+
+ * sysdeps/sparc/Makefile: Add -fPIC to ASFLAGS-.os here....
+ * sysdeps/sparc/sparc32/Makefile: rather than here...
+ * sysdeps/sparc/sparc64/Makefile: and here.
+
2012-03-28 Ulrich Drepper <drepper@gmail.com>
* malloc/mallocbug.c: Avoid warnings about unused variables.
diff --git a/sysdeps/sparc/Makefile b/sysdeps/sparc/Makefile
index 1dd70e8b55..3f0c096400 100644
--- a/sysdeps/sparc/Makefile
+++ b/sysdeps/sparc/Makefile
@@ -15,3 +15,6 @@ ifeq ($(subdir),csu)
CPPFLAGS-crti.S += -fPIC
CPPFLAGS-crtn.S += -fPIC
endif
+
+# The assembler on SPARC needs the -fPIC flag even when it's assembler code.
+ASFLAGS-.os += -fPIC
diff --git a/sysdeps/sparc/sparc32/Makefile b/sysdeps/sparc/sparc32/Makefile
index 9cb518fa3d..fb7132ee95 100644
--- a/sysdeps/sparc/sparc32/Makefile
+++ b/sysdeps/sparc/sparc32/Makefile
@@ -47,6 +47,3 @@ $(divrem:%=$(sysdep_dir)/sparc/sparc32/%.S): $(sysdep_dir)/sparc/sparc32/divrem.
mv -f $@-tmp $@
sysdep-realclean := $(sysdep-realclean) $(divrem:%=sysdeps/sparc/sparc32/%.S)
-
-# The assembler on SPARC needs the -fPIC flag even when it's assembler code.
-ASFLAGS-.os = -fPIC
diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile
index fb000329a9..2b7b83035a 100644
--- a/sysdeps/sparc/sparc64/Makefile
+++ b/sysdeps/sparc/sparc64/Makefile
@@ -7,9 +7,6 @@ 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