paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-31 11:31:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ armv4t

Browse Source 
* use armv4t and armv7m, in the makefiles instead of armv7 and cortexm3

git-svn-id: trunk@18863 -
This commit is contained in:
florian 2011-08-27 20:21:42 +00:00
parent c95f7b1c2f
commit 34b033ba72
6 changed files with 218 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/25] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/27]
# #
default: help default: help
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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@ -186,9 +186,9 @@ endif
endif endif
ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(FULL_TARGET),arm-embedded)
ifeq ($(SUBARCH),) ifeq ($(SUBARCH),)
$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=arm7 or SUBARCH=cortexm3) must be defined) $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined)
endif endif
override FPCOPT=+=Cp$(SUBARCH) override FPCOPT+=-Cp$(SUBARCH)
endif endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
TARGETSUFFIX=$(OS_TARGET) TARGETSUFFIX=$(OS_TARGET)

4
compiler/arm/cpuinfo.pas
View File

@ -34,6 +34,7 @@ Type
(cpu_none, (cpu_none,
cpu_armv3, cpu_armv3,
cpu_armv4, cpu_armv4,
cpu_armv4t,
cpu_armv5, cpu_armv5,
cpu_armv6, cpu_armv6,
cpu_armv7, cpu_armv7,
@ -41,7 +42,7 @@ Type
); );
Const Const
cpu_arm = [cpu_none,cpu_armv3,cpu_armv4,cpu_armv5]; cpu_arm = [cpu_none,cpu_armv3,cpu_armv4,cpu_armv4t,cpu_armv5];
cpu_thumb = []; cpu_thumb = [];
cpu_thumb2 = [cpu_armv7m]; cpu_thumb2 = [cpu_armv7m];
@ -182,6 +183,7 @@ Const
cputypestr : array[tcputype] of string[8] = ('', cputypestr : array[tcputype] of string[8] = ('',
'ARMV3', 'ARMV3',
'ARMV4', 'ARMV4',
'ARMV4T',
'ARMV5', 'ARMV5',
'ARMV6', 'ARMV6',
'ARMV7', 'ARMV7',

8
rtl/embedded/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/25] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/27]
# #
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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@ -187,7 +187,7 @@ endif
endif endif
ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(FULL_TARGET),arm-embedded)
ifeq ($(SUBARCH),) ifeq ($(SUBARCH),)
$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv7 or SUBARCH=cortexm3) must be defined) $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined)
endif endif
override FPCOPT+=-Cp$(SUBARCH) override FPCOPT+=-Cp$(SUBARCH)
endif endif
@ -314,10 +314,10 @@ endif
CPU_UNITS= CPU_UNITS=
SYSINIT_UNITS= SYSINIT_UNITS=
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
ifeq ($(SUBARCH),cortexm3) ifeq ($(SUBARCH),armv7m)
CPU_UNITS=lm3fury lm3tempest thumb2_bare stm32f103 CPU_UNITS=lm3fury lm3tempest thumb2_bare stm32f103
endif endif
ifeq ($(SUBARCH),armv7) ifeq ($(SUBARCH),armv4t)
CPU_UNITS=lpc21x4 at91sam7x256 CPU_UNITS=lpc21x4 at91sam7x256
endif endif
endif endif

4
rtl/embedded/Makefile.fpc
View File

@ -48,11 +48,11 @@ CPU_UNITS=
SYSINIT_UNITS= SYSINIT_UNITS=
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
ifeq ($(SUBARCH),cortexm3) ifeq ($(SUBARCH),armv7m)
CPU_UNITS=lm3fury lm3tempest thumb2_bare stm32f103 CPU_UNITS=lm3fury lm3tempest thumb2_bare stm32f103
endif endif
ifeq ($(SUBARCH),armv7) ifeq ($(SUBARCH),armv4t)
CPU_UNITS=lpc21x4 at91sam7x256 CPU_UNITS=lpc21x4 at91sam7x256
endif endif
endif endif

410
utils/fpcm/fpcmake.inc
View File

File diff suppressed because it is too large Load Diff

2
utils/fpcm/fpcmake.ini
View File

@ -275,7 +275,7 @@ endif
ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(FULL_TARGET),arm-embedded)
ifeq ($(SUBARCH),) ifeq ($(SUBARCH),)
# we don't add a default here, people should explicitly add the SUBARCH # we don't add a default here, people should explicitly add the SUBARCH
$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv7 or SUBARCH=cortexm3) must be defined) $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined)
endif endif
override FPCOPT+=-Cp$(SUBARCH) override FPCOPT+=-Cp$(SUBARCH)
endif endif