diff options
| author | Clément Chigot <clement.chigot@atos.net> | 2020-08-18 14:05:33 +0200 |
|---|---|---|
| committer | David Edelsohn <dje.gcc@gmail.com> | 2020-09-27 12:43:29 -0400 |
| commit | 3c11f25fb8bc3eaed35a90eece9d2f9444373513 (patch) | |
| tree | 2d0e537cbdddc2731bd30fbede67f46b0559b161 /libatomic | |
| parent | e5a76af3a2f3324efc60b4b2778ffb29d5c377bc (diff) | |
| download | gcc-3c11f25fb8bc3eaed35a90eece9d2f9444373513.tar.gz | |
aix: Use $(AR) without -X32_64 to build FAT libraries.
AIX FAT libraries should be built with the version of AR chosen by configure.
The GNU Make $(AR) variable includes the AIX -X32_64 option needed
by the default Makefile rules to accept both 32 bit and 64 bit object files.
The -X32_64 option conflicts with ar archiving objects of the same name
used to build FAT libraries.
This patch changes the Makefile fragments for AIX FAT libraries to use $(AR),
but strips the -X32_64 option from the Make variable.
libgcc/ChangeLog:
2020-09-27 Clement Chigot <clement.chigot@atos.net>
* config/rs6000/t-slibgcc-aix: Use $(AR) without -X32_64.
libatomic/ChangeLog:
2020-09-27 Clement Chigot <clement.chigot@atos.net>
* config/t-aix: Use $(AR) without -X32_64.
libgomp/ChangeLog:
2020-09-27 Clement Chigot <clement.chigot@atos.net>
* config/t-aix: Use $(AR) without -X32_64.
libstdc++-v3/ChangeLog:
2020-09-27 Clement Chigot <clement.chigot@atos.net>
* config/os/aix/t-aix: Use $(AR) without -X32_64.
libgfortran/ChangeLog:
2020-09-27 Clement Chigot <clement.chigot@atos.net>
* config/t-aix: Use $(AR) without -X32_64.
Diffstat (limited to 'libatomic')
| -rw-r--r-- | libatomic/config/t-aix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libatomic/config/t-aix b/libatomic/config/t-aix index 0f37aaa15f3..08607727574 100644 --- a/libatomic/config/t-aix +++ b/libatomic/config/t-aix @@ -3,8 +3,9 @@ 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 +ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g') all-local: - ar -X$(BITS) rc .libs/$(PACKAGE).a ../ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) - ar -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a ../pthread/ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) + $(ARX) -X$(BITS) rc .libs/$(PACKAGE).a ../ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) + $(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a ../pthread/ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) endif |