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.
This commit is contained in:
Clément Chigot
David Edelsohn
parent
e5a76af3a2
commit
3c11f25fb8
@ -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
|
||||
|
||||
|
||||
@ -92,27 +92,28 @@ AR_FLAGS_FOR_TARGET = -X32_64
|
||||
ifeq ($(MULTIBUILDTOP),)
|
||||
BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then \
|
||||
echo '64'; else echo '32'; fi)
|
||||
ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g')
|
||||
all: all-multi
|
||||
ifeq ($(enable_shared),yes)
|
||||
ar -X$(BITS) x ../ppc$(BITS)/libgcc/libgcc_s.a shr.o
|
||||
ar -X$(BITS) rc ./libgcc_s.a shr.o
|
||||
$(ARX) -X$(BITS) x ../ppc$(BITS)/libgcc/libgcc_s.a shr.o
|
||||
$(ARX) -X$(BITS) rc ./libgcc_s.a shr.o
|
||||
rm -f shr.o
|
||||
ar -X$(BITS) x ../pthread/ppc$(BITS)/libgcc/libgcc_s.a shr.o
|
||||
ar -X$(BITS) rc ../pthread/libgcc/libgcc_s.a shr.o
|
||||
$(ARX) -X$(BITS) x ../pthread/ppc$(BITS)/libgcc/libgcc_s.a shr.o
|
||||
$(ARX) -X$(BITS) rc ../pthread/libgcc/libgcc_s.a shr.o
|
||||
rm -f shr.o
|
||||
endif
|
||||
ar -X$(BITS) rc libgcc.a \
|
||||
$(ARX) -X$(BITS) rc libgcc.a \
|
||||
$(addprefix ../ppc$(BITS)/libgcc/,$(libgcc-objects))
|
||||
ar -X$(BITS) rc libgcc_eh.a \
|
||||
$(ARX) -X$(BITS) rc libgcc_eh.a \
|
||||
$(addprefix ../ppc$(BITS)/libgcc/,$(libgcc-eh-objects))
|
||||
ar -X$(BITS) rc ../pthread/libgcc/libgcc.a \
|
||||
$(ARX) -X$(BITS) rc ../pthread/libgcc/libgcc.a \
|
||||
$(addprefix ../pthread/ppc$(BITS)/libgcc/,$(libgcc-objects))
|
||||
ar -X$(BITS) rc ../pthread/libgcc/libgcc_eh.a \
|
||||
$(ARX) -X$(BITS) rc ../pthread/libgcc/libgcc_eh.a \
|
||||
$(addprefix ../pthread/ppc$(BITS)/libgcc/,$(libgcc-eh-objects))
|
||||
ifeq ($(enable_gcov),yes)
|
||||
ar -X$(BITS) rc libgcov.a \
|
||||
$(ARX) -X$(BITS) rc libgcov.a \
|
||||
$(addprefix ../ppc$(BITS)/libgcc/,$(libgcov-objects))
|
||||
ar -X$(BITS) rc ../pthread/libgcc/libgcov.a \
|
||||
$(ARX) -X$(BITS) rc ../pthread/libgcc/libgcov.a \
|
||||
$(addprefix ../pthread/ppc$(BITS)/libgcc/,$(libgcov-objects))
|
||||
endif
|
||||
$(MAKE) install-leaf DESTDIR=$(gcc_objdir) \
|
||||
|
||||
@ -3,9 +3,10 @@ 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
|
||||
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)
|
||||
ar -X$(BITS) rc .libs/libcaf_single.a ../ppc$(BITS)/$(PACKAGE)/.libs/$(libcaf_single_la_OBJECTS:.lo=.o)
|
||||
ar -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/libcaf_single.a ../pthread/ppc$(BITS)/$(PACKAGE)/.libs/$(libcaf_single_la_OBJECTS:.lo=.o)
|
||||
$(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)
|
||||
$(ARX) -X$(BITS) rc .libs/libcaf_single.a ../ppc$(BITS)/$(PACKAGE)/.libs/$(libcaf_single_la_OBJECTS:.lo=.o)
|
||||
$(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/libcaf_single.a ../pthread/ppc$(BITS)/$(PACKAGE)/.libs/$(libcaf_single_la_OBJECTS:.lo=.o)
|
||||
endif
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
ifeq ($(MULTIBUILDTOP),)
|
||||
BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then \
|
||||
echo '64'; else echo '32'; fi)
|
||||
ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g')
|
||||
MAJOR=$(firstword $(subst :, ,$(libtool_VERSION)))
|
||||
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
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@ ifeq ($(MULTIBUILDTOP),)
|
||||
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)))
|
||||
STOBJS=$(shell ar -X$(BITS) t ../ppc$(BITS)/$(PACKAGE)-v3/libsupc++/.libs/libsupc++.a)
|
||||
ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g')
|
||||
STOBJS=$(shell $(ARX) -X$(BITS) t ../ppc$(BITS)/$(PACKAGE)-v3/libsupc++/.libs/libsupc++.a)
|
||||
all-local:
|
||||
ar -X$(BITS) rc src/.libs/$(PACKAGE).a ../ppc$(BITS)/$(PACKAGE)-v3/src/.libs/$(PACKAGE).so.$(MAJOR)
|
||||
ar -X$(BITS) rc ../pthread/$(PACKAGE)-v3/src/.libs/$(PACKAGE).a ../pthread/ppc$(BITS)/$(PACKAGE)-v3/src/.libs/$(PACKAGE).so.$(MAJOR)
|
||||
ar -X$(BITS) rc libsupc++/.libs/libsupc++.a ${addprefix ../ppc$(BITS)/$(PACKAGE)-v3/libsupc++/,$(STOBJS)}
|
||||
ar -X$(BITS) rc ../pthread/$(PACKAGE)-v3/libsupc++/.libs/libsupc++.a ${addprefix ../pthread/ppc$(BITS)/$(PACKAGE)-v3/libsupc++/,$(STOBJS)}
|
||||
$(ARX) -X$(BITS) rc src/.libs/$(PACKAGE).a ../ppc$(BITS)/$(PACKAGE)-v3/src/.libs/$(PACKAGE).so.$(MAJOR)
|
||||
$(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)-v3/src/.libs/$(PACKAGE).a ../pthread/ppc$(BITS)/$(PACKAGE)-v3/src/.libs/$(PACKAGE).so.$(MAJOR)
|
||||
$(ARX) -X$(BITS) rc libsupc++/.libs/libsupc++.a ${addprefix ../ppc$(BITS)/$(PACKAGE)-v3/libsupc++/,$(STOBJS)}
|
||||
$(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)-v3/libsupc++/.libs/libsupc++.a ${addprefix ../pthread/ppc$(BITS)/$(PACKAGE)-v3/libsupc++/,$(STOBJS)}
|
||||
endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user