diff options
| author | svenbarth <svenbarth@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-10-24 20:58:24 +0000 |
|---|---|---|
| committer | svenbarth <svenbarth@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-10-24 20:58:24 +0000 |
| commit | 4ad58e1b14cdcb42babc3b47ff36d55cee25381d (patch) | |
| tree | 468b42297ec0ff6851060b0896278dce4e99bb52 /rtl/linux | |
| parent | e6937fc9e68647132b9e5d57e604f23ad9229dfb (diff) | |
| download | fpc-4ad58e1b14cdcb42babc3b47ff36d55cee25381d.tar.gz | |
* regenerate Makefiles after adding the softfpu units
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@47188 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'rtl/linux')
| -rw-r--r-- | rtl/linux/Makefile | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index b6f53f3f6d..e6cbed06f7 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -3106,15 +3106,34 @@ ifneq ($(findstring sparc64,$(shell uname -a)),) ifeq ($(BINUTILSPREFIX),) GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) +CROSSGCCOPT=-mabi=32 +else CROSSGCCOPT=-m32 endif endif endif endif +endif ifdef FPCFPMAKE FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP) ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET)) FPCMAKEGCCLIBDIR:=$(GCCLIBDIR) +else +ifneq ($(findstring $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),) +FPCMAKE_CROSSGCCOPT=-m64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips64 mips64el),) +FPCMAKE_CROSSGCCOPT=-mabi=64 +else +ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),) +FPCMAKE_CROSSGCCOPT=-mabi=32 +else +FPCMAKE_CROSSGCCOPT=-m32 +endif +endif +endif +FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`) endif endif ifndef FPCMAKEGCCLIBDIR @@ -4425,12 +4444,12 @@ ctypes$(PPUEXT) : $(INC)/ctypes.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) fpcylix$(PPUEXT) : fpcylix.pp cthreads$(PPUEXT) cwstring$(PPUEXT) dynlibs$(PPUEXT) objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) fpcylix.pp softfpu$(PPUEXT) : $(INC)/softfpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) - $(COMPILER) $(INC)/softfpu.pp + $(COMPILER) $< sfpux80$(PPUEXT) : $(INC)/sfpux80.pp $(INC)/softfpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) - $(COMPILER) $(INC)/sfpux80.pp + $(COMPILER) $< sfpu128$(PPUEXT) : $(INC)/sfpu128.pp $(INC)/softfpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) - $(COMPILER) $(INC)/sfpu128.pp + $(COMPILER) $< ufloatx80$(PPUEXT) : $(INC)/ufloatx80.pp sfpux80$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/ufloatx80.pp + $(COMPILER) $< ufloat128$(PPUEXT) : $(INC)/ufloat128.pp sfpu128$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/ufloat128.pp + $(COMPILER) $< |