Home Explore Help
Sign In
pascal
/
fpc
mirror of https://gitlab.com/freepascal.org/fpc/source.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

* Regenerate Makefile in the compiler with an uefi enabled fpcmake

git-svn-id: branches/olivier/uefi@36055 -
olivier 8 years ago
parent
e89f532467
commit
eed74ee48b
2 changed files with 51 additions and 2 deletions
Unified View Show Diff Stats
  1. 30 1
      compiler/Makefile
  2. 21 1
      compiler/utils/Makefile

+ 30 - 1
compiler/Makefile
View File 

@@ -2,7 +2,7 @@
 
 # Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-04-18 rev 35825]
 
 # Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-04-18 rev 35825]
 
 #
 
 #
 
 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-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm
 
+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 i386-uefi 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-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm
 
 BSDs = freebsd netbsd openbsd darwin dragonfly
 
 BSDs = freebsd netbsd openbsd darwin dragonfly
 
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 
 LIMIT83fs = go32v2 os2 emx watcom msdos win16
 
 LIMIT83fs = go32v2 os2 emx watcom msdos win16
 
@@ -635,6 +635,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override TARGET_DIRS+=utils
 
 override TARGET_DIRS+=utils
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override TARGET_DIRS+=utils
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override TARGET_DIRS+=utils
 
 override TARGET_DIRS+=utils
 
 endif
 
 endif
 
@@ -890,6 +893,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override TARGET_PROGRAMS+=pp
 
 override TARGET_PROGRAMS+=pp
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override TARGET_PROGRAMS+=pp
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override TARGET_PROGRAMS+=pp
 
 override TARGET_PROGRAMS+=pp
 
 endif
 
 endif
 
@@ -1146,6 +1152,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 
 endif
 
 endif
 
@@ -1401,6 +1410,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 
 endif
 
 endif
 
@@ -1656,6 +1668,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override COMPILER_TARGETDIR+=.
 
 override COMPILER_TARGETDIR+=.
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override COMPILER_TARGETDIR+=.
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override COMPILER_TARGETDIR+=.
 
 override COMPILER_TARGETDIR+=.
 
 endif
 
 endif
 
@@ -1911,6 +1926,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 
 endif
 
 endif
 
@@ -2504,6 +2522,11 @@ STATICLIBEXT=.a
 
 SHAREDLIBEXT=.dll
 
 SHAREDLIBEXT=.dll
 
 SHORTSUFFIX=w16
 
 SHORTSUFFIX=w16
 
 endif
 
 endif
 
+ifeq ($(OS_TARGET),uefi)
 
+SHAREDLIBEXT=.efi
 
+SHORTSUFFIX=efi
 
+EXEEXT=.efi
 
+endif
 
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 
 ZIPSUFFIX=$(SHORTSUFFIX)
 
 ZIPSUFFIX=$(SHORTSUFFIX)
 
@@ -2831,6 +2854,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 REQUIRE_PACKAGES_RTL=1
 
 REQUIRE_PACKAGES_RTL=1
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+REQUIRE_PACKAGES_RTL=1
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 REQUIRE_PACKAGES_RTL=1
 
 REQUIRE_PACKAGES_RTL=1
 
 endif
 
 endif
 
@@ -3727,6 +3753,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 TARGET_DIRS_UTILS=1
 
 TARGET_DIRS_UTILS=1
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+TARGET_DIRS_UTILS=1
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 TARGET_DIRS_UTILS=1
 
 TARGET_DIRS_UTILS=1
 
 endif
 
 endif

+ 21 - 1
compiler/utils/Makefile
View File 

@@ -2,7 +2,7 @@
 
 # Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-04-18 rev 35825]
 
 # Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-04-18 rev 35825]
 
 #
 
 #
 
 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-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm
 
+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 i386-uefi 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-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm
 
 BSDs = freebsd netbsd openbsd darwin dragonfly
 
 BSDs = freebsd netbsd openbsd darwin dragonfly
 
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 
 LIMIT83fs = go32v2 os2 emx watcom msdos win16
 
 LIMIT83fs = go32v2 os2 emx watcom msdos win16
 
@@ -403,6 +403,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins
 
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins
 
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins
 
 endif
 
 endif
 
@@ -658,6 +661,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override CLEAN_UNITS+=ppu crc
 
 override CLEAN_UNITS+=ppu crc
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override CLEAN_UNITS+=ppu crc
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override CLEAN_UNITS+=ppu crc
 
 override CLEAN_UNITS+=ppu crc
 
 endif
 
 endif
 
@@ -914,6 +920,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override COMPILER_UNITDIR+=..
 
 override COMPILER_UNITDIR+=..
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override COMPILER_UNITDIR+=..
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override COMPILER_UNITDIR+=..
 
 override COMPILER_UNITDIR+=..
 
 endif
 
 endif
 
@@ -1169,6 +1178,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 override COMPILER_SOURCEDIR+=..
 
 override COMPILER_SOURCEDIR+=..
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+override COMPILER_SOURCEDIR+=..
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 override COMPILER_SOURCEDIR+=..
 
 override COMPILER_SOURCEDIR+=..
 
 endif
 
 endif
 
@@ -1764,6 +1776,11 @@ STATICLIBEXT=.a
 
 SHAREDLIBEXT=.dll
 
 SHAREDLIBEXT=.dll
 
 SHORTSUFFIX=w16
 
 SHORTSUFFIX=w16
 
 endif
 
 endif
 
+ifeq ($(OS_TARGET),uefi)
 
+SHAREDLIBEXT=.efi
 
+SHORTSUFFIX=efi
 
+EXEEXT=.efi
 
+endif
 
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 
 ZIPSUFFIX=$(SHORTSUFFIX)
 
 ZIPSUFFIX=$(SHORTSUFFIX)
 
@@ -2091,6 +2108,9 @@ endif
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 ifeq ($(FULL_TARGET),i386-aros)
 
 REQUIRE_PACKAGES_RTL=1
 
 REQUIRE_PACKAGES_RTL=1
 
 endif
 
 endif
 
+ifeq ($(FULL_TARGET),i386-uefi)
 
+REQUIRE_PACKAGES_RTL=1
 
+endif
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 ifeq ($(FULL_TARGET),m68k-linux)
 
 REQUIRE_PACKAGES_RTL=1
 
 REQUIRE_PACKAGES_RTL=1
 
 endif
 
 endif