public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/ppalka/heads/libstdcxx-floating-to_chars)] aix: FAT libraries: test native compiler mode directly
@ 2020-07-14 19:45 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2020-07-14 19:45 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:4f97bed9a7989e14cbb53e405fbd8b3c08aa75ec
commit 4f97bed9a7989e14cbb53e405fbd8b3c08aa75ec
Author: David Edelsohn <dje.gcc@gmail.com>
Date: Mon Jul 13 14:43:39 2020 -0400
aix: FAT libraries: test native compiler mode directly
The FAT libraries config fragments need to know which library is native
and which is a multilib to choose the correct multilib from which to
append the additional object file or shared object file. Testing the
top-level archive is fragile because it will fail if rebuilding. This
patch tests the compiler preprocessing macros for the 64 bit AIX specific
__64BIT__ to determine the native mode of the compiler in MULTILIBTOP.
2020-07-14 David Edelsohn <dje.gcc@gmail.com>
libatomic/ChangeLog
* config/t-aix: Set BITS from compiler cpp macro.
libgcc/ChangeLog
* config/rs6000/t-slibgcc-aix: Set BITS from compiler cpp macro.
libgfortran/ChangeLog
* config/t-aix: Set BITS from compiler cpp macro.
libgomp/ChangeLog
* config/t-aix: Set BITS from compiler cpp macro.
libstdc++-v3/ChangeLog
* config/os/aix/t-aix: Set BITS from compiler cpp macro.
Diff:
---
libatomic/config/t-aix | 2 +-
libgcc/config/rs6000/t-slibgcc-aix | 2 +-
libgfortran/config/t-aix | 2 +-
libgomp/config/t-aix | 2 +-
libstdc++-v3/config/os/aix/t-aix | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libatomic/config/t-aix b/libatomic/config/t-aix
index 53c2d83242f..0f37aaa15f3 100644
--- a/libatomic/config/t-aix
+++ b/libatomic/config/t-aix
@@ -1,5 +1,5 @@
ifeq ($(MULTIBUILDTOP),)
-BITS=$(shell if test -z "`ar -X64 t .libs/$(PACKAGE).a`" ; then \
+BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then \
echo '64'; else echo '32'; fi)
#MAJOR=$(firstword $(subst :, ,$(libtool_VERSION)))
MAJOR=1
diff --git a/libgcc/config/rs6000/t-slibgcc-aix b/libgcc/config/rs6000/t-slibgcc-aix
index e5f8a029ff8..b3bdda6f9a8 100644
--- a/libgcc/config/rs6000/t-slibgcc-aix
+++ b/libgcc/config/rs6000/t-slibgcc-aix
@@ -90,7 +90,7 @@ AR_FLAGS_FOR_TARGET = -X32_64
# Build and install AIX-style FAT libraries
ifeq ($(MULTIBUILDTOP),)
-BITS=$(shell if test -z "`ar -X64 t libgcc_s.a`" ; then \
+BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then \
echo '64'; else echo '32'; fi)
all: all-multi
ifeq ($(enable_shared),yes)
diff --git a/libgfortran/config/t-aix b/libgfortran/config/t-aix
index 7046aeeacc3..e661286da12 100644
--- a/libgfortran/config/t-aix
+++ b/libgfortran/config/t-aix
@@ -1,5 +1,5 @@
ifeq ($(MULTIBUILDTOP),)
-BITS=$(shell if test -z "`ar -X64 t .libs/$(PACKAGE).a`" ; then \
+BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then \
echo '64'; else echo '32'; fi)
#MAJOR=$(firstword $(subst :, ,$(libtool_VERSION)))
MAJOR=5
diff --git a/libgomp/config/t-aix b/libgomp/config/t-aix
index 5d0b7e0f9ae..c3bb6c0bce0 100644
--- a/libgomp/config/t-aix
+++ b/libgomp/config/t-aix
@@ -1,5 +1,5 @@
ifeq ($(MULTIBUILDTOP),)
-BITS=$(shell if test -z "`ar -X64 t .libs/$(PACKAGE).a`" ; then \
+BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then \
echo '64'; else echo '32'; fi)
MAJOR=$(firstword $(subst :, ,$(libtool_VERSION)))
all-local:
diff --git a/libstdc++-v3/config/os/aix/t-aix b/libstdc++-v3/config/os/aix/t-aix
index a588746dd99..a5d58fab474 100644
--- a/libstdc++-v3/config/os/aix/t-aix
+++ b/libstdc++-v3/config/os/aix/t-aix
@@ -1,5 +1,5 @@
ifeq ($(MULTIBUILDTOP),)
-BITS=$(shell if test -z "`ar -X64 t src/.libs/$(PACKAGE).a`" ; then \
+BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then \
echo '64'; else echo '32'; fi)
MAJOR=$(firstword $(subst :, ,$(libtool_VERSION)))
all-local:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-07-14 19:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-14 19:45 [gcc(refs/users/ppalka/heads/libstdcxx-floating-to_chars)] aix: FAT libraries: test native compiler mode directly Patrick Palka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).