From 020bd6f43f4fb156a15d54bfb8b3ab75683e605c Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Thu, 30 Oct 2014 14:20:50 +0000 Subject: [PATCH] configure.host (aix5+): New stanza. * configure.host (aix5+): New stanza. (aix4.3+): Do not use -G in link command. From-SVN: r216935 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/configure.host | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 08c44c3e552..4e01b1042ae 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-10-30 David Edelsohn + + * configure.host (aix5+): New stanza. + (aix4.3+): Do not use -G in link command. + 2014-10-29 Jonathan Wakely * include/std/functional: (_Function_base::_Function_base()): Use diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host index d1298c43cf5..6f7b09d51e9 100644 --- a/libstdc++-v3/configure.host +++ b/libstdc++-v3/configure.host @@ -212,14 +212,19 @@ cpu_opt_ext_random=cpu/generic/opt/bits/opt_random.h # CPU-specifc, set those here too. # THIS TABLE IS SORTED. KEEP IT THAT WAY. case "${host_os}" in - aix4.[3456789]* | aix[56789]*) + aix[56789]*) + # Newer versions of AIX only support PowerPC architecture, so use + # atomic instructions directly. + os_include_dir="os/aix" + atomic_word_dir="os/aix" + ;; + aix4.[3456789]*) # We set os_include_dir to os/aix only on AIX 4.3 and newer, but # os/aix/atomicity.h works on earlier versions of AIX 4.*, so we # explicitly duplicate the directory for 4.[<3]. os_include_dir="os/aix" atomicity_dir="os/aix" atomic_word_dir="os/aix" - OPT_LDFLAGS="-Wl,-G" ;; aix4.*) os_include_dir="os/generic" -- 2.30.2