summaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-05-09 15:59:55 +0000
committerUlrich Drepper <drepper@redhat.com>2009-05-09 15:59:55 +0000
commit23b6b4664622ba8efb728b1cd02c2992a4a1b717 (patch)
treec6d6d8895276daaf34d6e222ebb6b72f9be25a0e /Makeconfig
parent15417de3e0f219574fb1f63dae24c33c5afb73e7 (diff)
[BZ #10118]
2009-05-06 Ryan S. Arnold <rsa@us.ibm.com> [BZ #10118] * Makeconfig (+asflags): New variable based upon ASFLAG or asflags-cpu. (ASFLAGS): Add override to set ASFLAGS to +asflags. * config.make.in (asflags-cpu): Add variable based upon @libc_cv_cc_submachine@ to propagate -mcpu=CPU from --with-cpu=CPU to the assembler. * sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/setcontext.S: Remove unneeded file now that the assembler emits _ARCH_PWR6 and recognizes power6 instruction set due to passing -mcpu=power6 from --with-cpu=power6 when compiling .S files. * sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/swapcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S: Likewise.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/Makeconfig b/Makeconfig
index 64886aee26..985c683f6e 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -649,6 +649,16 @@ endif # $(+cflags) == ""
# Don't duplicate options if we inherited variables from the parent.
+cflags := $(sort $(+cflags))
+# These are the flags given to the compiler to tell it what sort of
+# optimization and/or debugging output to do for .S files.
+ifndef +asflags
+# If `ASFLAGS' was defined, use that.
+ifdef ASFLAGS
++asflags := $(ASFLAGS)
+endif #ASFLAGS
+endif # +asflags
+
++asflags += $(asflags-cpu)
# These are flags given to the C compiler to tell it to look for
# include files (including ones given in angle brackets) in the parent
@@ -681,6 +691,8 @@ override CXXFLAGS = $(c++-sysincludes) \
$(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \
$(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F))
+override ASFLAGS = $(+asflags)
+
# If everything is compiled with -fPIC (implicitly) we must tell this by
# defining the PIC symbol.
ifeq (yes,$(build-pic-default))