47ddb895df
This patch adds the ability to configure GCC on AIX to build as a 64 bit application and to build target libraries "FAT" libraries in both 32 bit and 64 bit mode. The patch adds makefile fragment hooks to target libraries that allows them to include target-specific rules. The target specific rules for AIX place both 32 bit and 64 bit objects and shared objects in archives at the top-level, not multilib subdirectories. The multilibs are built in subdirectories, but must be combined during the last parts of the target library build process. Because of the way that GCC bootstrap works, the libraries must be combined during the multiple stages of GCC bootstrap, not solely when installed in the final destination, so the libraries are correct at the end of each target library build stage, not solely an install recipe. gcc/ChangeLog 2020-06-21 David Edelsohn <dje.gcc@gmail.com> * config.gcc: Use t-aix64, biarch64 and default64 for cpu_is_64bit. * config/rs6000/aix72.h (ASM_SPEC): Remove aix64 option. (ASM_SPEC32): New. (ASM_SPEC64): New. (ASM_CPU_SPEC): Remove vsx and altivec options. (CPP_SPEC_COMMON): Rename from CPP_SPEC. (CPP_SPEC32): New. (CPP_SPEC64): New. (CPLUSPLUS_CPP_SPEC): Rename to CPLUSPLUS_CPP_SPEC_COMMON.. (TARGET_DEFAULT): Only define if not BIARCH. (LIB_SPEC_COMMON): Rename from LIB_SPEC. (LIB_SPEC32): New. (LIB_SPEC64): New. (LINK_SPEC_COMMON): Rename from LINK_SPEC. (LINK_SPEC32): New. (LINK_SPEC64): New. (STARTFILE_SPEC): Add 64 bit version of crtcxa and crtdbase. (ASM_SPEC): Define 32 and 64 bit alternatives using DEFAULT_ARCH64_P. (CPP_SPEC): Same. (CPLUSPLUS_CPP_SPEC): Same. (LIB_SPEC): Same. (LINK_SPEC): Same. (SUBTARGET_EXTRA_SPECS): Add new 32/64 specs. * config/rs6000/defaultaix64.h: New file. * config/rs6000/t-aix64: New file. libgcc/ChangeLog 2020-06-21 David Edelsohn <dje.gcc@gmail.com> * config.host (extra_parts): Add crtcxa_64 and crtdbase_64. * config/rs6000/t-aix-cxa: Explicitly compile 32 bit with -maix32 and 64 bit with -maix64. * config/rs6000/t-slibgcc-aix: Remove extra @multilib_dir@ level. Build and install AIX-style FAT libraries. libgomp/ChangeLog 2020-06-21 David Edelsohn <dje.gcc@gmail.com> * Makefile.am (tmake_file): Build and install AIX-style FAT libraries. * Makefile.in: Regenerate * configure.ac (tmake_file): Substitute. * configure: Regenerate. * configure.tgt (powerpc-ibm-aix*): Define tmake_file. * config/t-aix: New file. libstdc++-v3/ChangeLog 2020-06-21 David Edelsohn <dje.gcc@gmail.com> * Makefile.am (tmake_file): Build and install AIX-style FAT libraries. * Makefile.in: Regenerate. * configure.ac (tmake_file): Substitute. * configure: Regenerate. * configure.host (aix*): Define tmake_file. * config/os/aix/t-aix: New file. libatomic/ChangeLog 2020-06-21 David Edelsohn <dje.gcc@gmail.com> * Makefile.am (tmake_file): Build and install AIX-style FAT libraries. * Makefile.in: Regenerate. * configure.ac (tmake_file): Substitute. * configure: Regenerate. * configure.tgt (powerpc-ibm-aix*): Define tmake_file. * config/t-aix: New file. libgfortran/ChangeLog 2020-06-21 David Edelsohn <dje.gcc@gmail.com> * Makefile.am (tmake_file): Build and install AIX-style FAT libraries. * Makefile.in: Regenerate. * configure.ac (tmake_file): Substitute. * configure: Regenerate. * configure.host: Add system configury stanza. Define tmake_file. * config/t-aix: New file.
123 lines
4.8 KiB
Plaintext
123 lines
4.8 KiB
Plaintext
# Copyright (C) 2002-2020 Free Software Foundation, Inc.
|
|
#
|
|
# This file is part of GCC.
|
|
#
|
|
# GCC is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3, or (at your option)
|
|
# any later version.
|
|
#
|
|
# GCC is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GCC; see the file COPYING3. If not see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
# Build a shared libgcc library according to --with-aix-soname selection:
|
|
# aix-soname=aix:
|
|
# libgcc_s.a(shr.o) # traditional (-bnortl)
|
|
#
|
|
# aix-soname=both:
|
|
# libgcc_s.a(shr.o) # traditional (-bnortl)
|
|
# libgcc_s.so.1(shrXX.o,shrXX.imp) # the SONAME (-G)
|
|
# libgcc_s.so -> libgcc_s.so.1 # the symlink
|
|
#
|
|
# aix-soname=svr4:
|
|
# libgcc_s.so.1(shrXX.o,shrXX.imp) # the SONAME (-G)
|
|
# libgcc_s.so -> libgcc_s.so.1 # the symlink
|
|
SHLIB_EXT_aix = .a
|
|
SHLIB_EXT_both = .so
|
|
SHLIB_EXT_svr4 = .so
|
|
SHLIB_EXT = $(SHLIB_EXT_$(with_aix_soname))
|
|
SHLIB_SOVERSION = 1
|
|
SHLIB_SONAME = @shlib_base_name@.so.$(SHLIB_SOVERSION)
|
|
SHLIB_LINK = \
|
|
if test svr4 != $(with_aix_soname) ; then \
|
|
$(CC) $(LIBGCC2_CFLAGS) -shared -Wl,-bnortl -nodefaultlibs \
|
|
-Wl,-bE:@shlib_map_file@ -o shr.o \
|
|
@multilib_flags@ @shlib_objs@ -lc \
|
|
`case @multilib_dir@ in \
|
|
*pthread*) echo -L$(TARGET_SYSTEM_ROOT)/usr/lib/threads -lpthreads -lc_r $(TARGET_SYSTEM_ROOT)/usr/lib/libc.a ;; \
|
|
*) echo -lc ;; esac` ; \
|
|
rm -f tmp-@shlib_base_name@.a ; \
|
|
$(AR_CREATE_FOR_TARGET) tmp-@shlib_base_name@.a shr.o ; \
|
|
mv tmp-@shlib_base_name@.a @shlib_base_name@.a ; \
|
|
rm -f shr.o ; \
|
|
fi ; \
|
|
if test aix != $(with_aix_soname) ; then \
|
|
case @multilib_dir@ in *64*) shr='shr_64' ;; *) shr='shr' ;; esac ; \
|
|
$(CC) $(LIBGCC2_CFLAGS) -shared -Wl,-G -nodefaultlibs \
|
|
-Wl,-bE:@shlib_map_file@ -o $$shr.o \
|
|
@multilib_flags@ @shlib_objs@ -lc \
|
|
`case @multilib_dir@ in \
|
|
*pthread*) echo -L$(TARGET_SYSTEM_ROOT)/usr/lib/threads -lpthreads -lc_r $(TARGET_SYSTEM_ROOT)/usr/lib/libc.a ;; \
|
|
*) echo -lc ;; esac` ; \
|
|
$(STRIP_FOR_TARGET) -X32_64 -e $$shr.o ; \
|
|
{ echo "\#! $(SHLIB_SONAME)($$shr.o)" ; \
|
|
case @multilib_dir@ in *64*) echo '\# 64' ;; *) echo '\# 32' ;; esac ; \
|
|
cat @shlib_map_file@ ; \
|
|
} > $$shr.imp ; \
|
|
rm -f tmp-$(SHLIB_SONAME) ; \
|
|
$(AR_CREATE_FOR_TARGET) tmp-$(SHLIB_SONAME) $$shr.imp $$shr.o ; \
|
|
mv tmp-$(SHLIB_SONAME) $(SHLIB_SONAME) ; \
|
|
rm -f @shlib_base_name@.so ; \
|
|
$(LN_S) $(SHLIB_SONAME) @shlib_base_name@.so ; \
|
|
rm -f $$shr.imp $$shr.o ; \
|
|
fi
|
|
SHLIB_INSTALL = \
|
|
$(mkinstalldirs) $(DESTDIR)$(slibdir)@shlib_slibdir_qual@; \
|
|
if test svr4 != $(with_aix_soname) ; then \
|
|
$(INSTALL_DATA) @shlib_base_name@.a \
|
|
$(DESTDIR)$(slibdir)@shlib_slibdir_qual@/ ; \
|
|
fi ; \
|
|
if test aix != $(with_aix_soname) ; then \
|
|
$(INSTALL_DATA) $(SHLIB_SONAME) \
|
|
$(DESTDIR)$(slibdir)@shlib_slibdir_qual@/ ; \
|
|
rm -f $(DESTDIR)$(slibdir)@shlib_slibdir_qual@/@shlib_base_name@.so ; \
|
|
$(LN_S) $(SHLIB_SONAME) \
|
|
$(DESTDIR)$(slibdir)@shlib_slibdir_qual@/@shlib_base_name@.so ; \
|
|
fi
|
|
SHLIB_LIBS = -lc `case @multilib_dir@ in *pthread*) echo -lpthread ;; esac`
|
|
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
|
|
SHLIB_MAPFILES = libgcc-std.ver
|
|
SHLIB_NM_FLAGS = -Bpg -X32_64
|
|
|
|
# Either 32-bit and 64-bit objects in archives.
|
|
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 \
|
|
echo '64'; else echo '32'; fi)
|
|
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
|
|
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
|
|
rm -f shr.o
|
|
endif
|
|
ar -X$(BITS) rc libgcc.a \
|
|
$(addprefix ../ppc$(BITS)/libgcc/,$(libgcc-objects))
|
|
ar -X$(BITS) rc libgcc_eh.a \
|
|
$(addprefix ../ppc$(BITS)/libgcc/,$(libgcc-eh-objects))
|
|
ar -X$(BITS) rc ../pthread/libgcc/libgcc.a \
|
|
$(addprefix ../pthread/ppc$(BITS)/libgcc/,$(libgcc-objects))
|
|
ar -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 \
|
|
$(addprefix ../ppc$(BITS)/libgcc/,$(libgcov-objects))
|
|
ar -X$(BITS) rc ../pthread/libgcc/libgcov.a \
|
|
$(addprefix ../pthread/ppc$(BITS)/libgcc/,$(libgcov-objects))
|
|
endif
|
|
$(MAKE) install-leaf DESTDIR=$(gcc_objdir) \
|
|
slibdir= libsubdir= MULTIOSDIR=$(MULTIDIR)
|
|
cp ../pthread/libgcc/libgcc_s.a ../../gcc/pthread/
|
|
cp ../pthread/libgcc/libgcc_eh.a ../../gcc/pthread/
|
|
endif
|