Browse Source

Merge trunk commit 36785, to fix building of shared libs for sparc-linux.

------------------------------------------------------------------------
r36785 | pierre | 2017-07-25 06:51:06 +0000 (Tue, 25 Jul 2017) | 1 line

 Add -KPIC to ASSHAREDOPT for sparc and sparc64
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_0@39455 -
pierre 7 years ago
parent
commit
1d29165572
2 changed files with 5 additions and 1 deletions
  1. 3 1
      rtl/linux/Makefile
  2. 2 0
      rtl/linux/Makefile.fpc

+ 3 - 1
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-12-01 rev 37640]
 #
 #
 default: all
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos
@@ -3438,6 +3438,8 @@ ifeq ($(ARCH),sparc)
   ifneq ($(findstring -fPIC ,$(COMPILER)),)
   ifneq ($(findstring -fPIC ,$(COMPILER)),)
     ASTARGET+=-K PIC --defsym PIC=1
     ASTARGET+=-K PIC --defsym PIC=1
   endif
   endif
+  ASTARGET+=-32
+  ASSHAREDOPT=-KPIC
 endif
 endif
 ifeq ($(ARCH),arm)
 ifeq ($(ARCH),arm)
   ifeq ($(SUBARCH),armv6m)
   ifeq ($(SUBARCH),armv6m)

+ 2 - 0
rtl/linux/Makefile.fpc

@@ -145,6 +145,8 @@ ifeq ($(ARCH),sparc)
   ifneq ($(findstring -fPIC ,$(COMPILER)),)
   ifneq ($(findstring -fPIC ,$(COMPILER)),)
     ASTARGET+=-K PIC --defsym PIC=1
     ASTARGET+=-K PIC --defsym PIC=1
   endif
   endif
+  ASTARGET+=-32
+  ASSHAREDOPT=-KPIC
 endif
 endif
 
 
 ifeq ($(ARCH),arm)
 ifeq ($(ARCH),arm)