diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index b9e7881088..2824bded90 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -37,7 +37,7 @@ CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr # All supported targets used for clean ALLTARGETS=$(CYCLETARGETS) -# Allow ALPHA, POWERPC, POWERPC64, M68K, I386, jvm defines for target cpu +# Allow POWERPC, POWERPC64, M68K, I386, jvm defines for target cpu ifdef POWERPC PPC_TARGET=powerpc endif diff --git a/compiler/aasmtai.pas b/compiler/aasmtai.pas index 6b9608588b..87912696a2 100644 --- a/compiler/aasmtai.pas +++ b/compiler/aasmtai.pas @@ -69,14 +69,6 @@ interface ait_stab, ait_force_line, ait_function_name, -{$ifdef alpha} - { the follow is for the DEC Alpha } - ait_frame, -{$endif alpha} -{$ifdef ia64} - ait_bundle, - ait_stop, -{$endif ia64} {$ifdef m68k} ait_labeled_instruction, {$endif m68k} @@ -197,14 +189,6 @@ interface 'stab', 'force_line', 'function_name', -{$ifdef alpha} - { the follow is for the DEC Alpha } - 'frame', -{$endif alpha} -{$ifdef ia64} - 'bundle', - 'stop', -{$endif ia64} {$ifdef m68k} 'labeled_instr', {$endif m68k} @@ -348,7 +332,7 @@ interface asd_weak_definition, { for Jasmin } asd_jclass,asd_jinterface,asd_jsuper,asd_jfield,asd_jlimit,asd_jline, - { .ent/.end for MIPS and Alpha } + { .ent/.end for MIPS } asd_ent,asd_ent_end, { supported by recent clang-based assemblers for data-in-code } asd_data_region, asd_end_data_region, @@ -383,7 +367,7 @@ interface 'no_dead_strip','weak_reference','lazy_reference','weak_definition', { for Jasmin } 'class','interface','super','field','limit','line', - { .ent/.end for MIPS and Alpha } + { .ent/.end for MIPS } 'ent','end', { supported by recent clang-based assemblers for data-in-code } 'data_region','end_data_region', diff --git a/compiler/aggas.pas b/compiler/aggas.pas index c8ac19b9d2..583c013f1b 100644 --- a/compiler/aggas.pas +++ b/compiler/aggas.pas @@ -142,13 +142,6 @@ implementation #9'.uahalf'#9,#9'.uaword'#9,#9'.uaxword'#9 ); - { Alpha type of unaligned pseudo-instructions } - use_ua_alpha_systems = [system_alpha_linux]; - ait_ua_alpha_const2str : array[aitconst_16bit_unaligned..aitconst_64bit_unaligned] - of string[20]=( - #9'.uword'#9,#9'.ulong'#9,#9'.uquad'#9 - ); - { Generic unaligned pseudo-instructions, seems ELF specific } use_ua_elf_systems = [system_mipsel_linux,system_mipseb_linux,system_mipsel_android,system_mipsel_embedded,system_mipseb_embedded]; ait_ua_elf_const2str : array[aitconst_16bit_unaligned..aitconst_64bit_unaligned] @@ -954,9 +947,6 @@ implementation if (constdef in ait_unaligned_consts) and (target_info.system in use_ua_sparc_systems) then AsmWrite(ait_ua_sparc_const2str[constdef]) - else if (constdef in ait_unaligned_consts) and - (target_info.system in use_ua_alpha_systems) then - AsmWrite(ait_ua_alpha_const2str[constdef]) else if (constdef in ait_unaligned_consts) and (target_info.system in use_ua_elf_systems) then AsmWrite(ait_ua_elf_const2str[constdef]) diff --git a/compiler/fpcdefs.inc b/compiler/fpcdefs.inc index 1fb0d301e3..d0d9a0628a 100644 --- a/compiler/fpcdefs.inc +++ b/compiler/fpcdefs.inc @@ -93,20 +93,6 @@ {$define cpucapabilities} {$endif x86_64} -{$ifdef ia64} - {$define cpuflags} - {$define cpu64bitalu} - {$define cpu64bitaddr} - {$define cpuextended} - {$define cpufloat128} -{$endif ia64} - -{$ifdef alpha} - {$define cpu64bitalu} - {$define cpu64bitaddr} - {$define cpurefshaveindexreg} -{$endif alpha} - {$ifdef sparc} {$define cpu32bit} {$define cpu32bitaddr} diff --git a/compiler/globals.pas b/compiler/globals.pas index 5c8bb28c5a..d38700cd81 100644 --- a/compiler/globals.pas +++ b/compiler/globals.pas @@ -444,11 +444,6 @@ interface optimizecputype : cpu_athlon64; fputype : fpu_sse64; {$endif x86_64} - {$ifdef ia64} - cputype : cpu_itanium; - optimizecputype : cpu_itanium; - fputype : fpu_itanium; - {$endif ia64} {$ifdef avr} cputype : cpuinfo.cpu_avr5; optimizecputype : cpuinfo.cpu_avr5; diff --git a/compiler/options.pas b/compiler/options.pas index a93316b66c..24fbea8603 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -679,9 +679,6 @@ begin {$ifdef sparc} 'S', {$endif} -{$ifdef vis} - 'I', -{$endif} {$ifdef avr} 'V', {$endif} @@ -3322,10 +3319,6 @@ begin def_system_macro('FPC_CURRENCY_IS_INT64'); def_system_macro('FPC_COMP_IS_INT64'); {$endif} -{$ifdef ALPHA} - def_system_macro('CPUALPHA'); - def_system_macro('CPU64'); -{$endif} {$ifdef powerpc} def_system_macro('CPUPOWERPC'); def_system_macro('CPUPOWERPC32'); @@ -3340,10 +3333,6 @@ begin def_system_macro('FPC_CURRENCY_IS_INT64'); def_system_macro('FPC_COMP_IS_INT64'); {$endif} -{$ifdef iA64} - def_system_macro('CPUIA64'); - def_system_macro('CPU64'); -{$endif} {$ifdef x86_64} def_system_macro('CPUX86_64'); def_system_macro('CPUAMD64'); @@ -3367,10 +3356,6 @@ begin def_system_macro('FPC_CURRENCY_IS_INT64'); def_system_macro('FPC_COMP_IS_INT64'); {$endif} -{$ifdef vis} - def_system_macro('CPUVIS'); - def_system_macro('CPU32'); -{$endif} {$ifdef arm} def_system_macro('CPUARM'); def_system_macro('CPU32'); diff --git a/compiler/pp.pas b/compiler/pp.pas index 09c307b7b4..8bd4a53c1d 100644 --- a/compiler/pp.pas +++ b/compiler/pp.pas @@ -32,7 +32,6 @@ program pp; SPARC generate a compiler for SPARC POWERPC generate a compiler for the PowerPC POWERPC64 generate a compiler for the PowerPC64 architecture - VIS generate a compile for the VIS DEBUG version with debug code is generated EXTDEBUG some extra debug code is executed SUPPORT_MMX only i386: releases the compiler switch @@ -87,18 +86,6 @@ program pp; {$endif CPUDEFINED} {$define CPUDEFINED} {$endif M68K} -{$ifdef vis} - {$ifdef CPUDEFINED} - {$fatal ONLY one of the switches for the CPU type must be defined} - {$endif CPUDEFINED} - {$define CPUDEFINED} -{$endif} -{$ifdef iA64} - {$ifdef CPUDEFINED} - {$fatal ONLY one of the switches for the CPU type must be defined} - {$endif CPUDEFINED} - {$define CPUDEFINED} -{$endif iA64} {$ifdef POWERPC} {$ifdef CPUDEFINED} {$fatal ONLY one of the switches for the CPU type must be defined} @@ -111,12 +98,6 @@ program pp; {$endif CPUDEFINED} {$define CPUDEFINED} {$endif POWERPC64} -{$ifdef ALPHA} - {$ifdef CPUDEFINED} - {$fatal ONLY one of the switches for the CPU type must be defined} - {$endif CPUDEFINED} - {$define CPUDEFINED} -{$endif ALPHA} {$ifdef SPARC} {$ifdef CPUDEFINED} {$fatal ONLY one of the switches for the CPU type must be defined} diff --git a/compiler/psystem.pas b/compiler/psystem.pas index 96449c3f16..809a43ce33 100644 --- a/compiler/psystem.pas +++ b/compiler/psystem.pas @@ -719,18 +719,10 @@ implementation aiclass[ait_stab]:=tai_stab; aiclass[ait_force_line]:=tai_force_line; aiclass[ait_function_name]:=tai_function_name; -{$ifdef alpha} - { the follow is for the DEC Alpha } - aiclass[ait_frame]:=tai_frame; -{$endif alpha} {$ifdef m68k} { TODO: FIXME: tai_labeled_instruction doesn't exists} // aiclass[ait_labeled_instruction]:=tai_labeled_instruction; {$endif m68k} -{$ifdef ia64} - aiclass[ait_bundle]:=tai_bundle; - aiclass[ait_stop]:=tai_stop; -{$endif ia64} {$ifdef SPARC} // aiclass[ait_labeled_instruction]:=tai_labeled_instruction; {$endif SPARC} diff --git a/compiler/systems.pas b/compiler/systems.pas index 9ba1c148ca..feba99aad7 100644 --- a/compiler/systems.pas +++ b/compiler/systems.pas @@ -223,7 +223,7 @@ interface systems_wince = [system_arm_wince,system_i386_wince]; systems_android = [system_arm_android, system_i386_android, system_mipsel_android]; systems_linux = [system_i386_linux,system_x86_64_linux,system_powerpc_linux,system_powerpc64_linux, - system_arm_linux,system_sparc_linux,system_alpha_linux,system_m68k_linux, + system_arm_linux,system_sparc_linux,system_m68k_linux, system_x86_6432_linux,system_mipseb_linux,system_mipsel_linux,system_aarch64_linux]; systems_dragonfly = [system_x86_64_dragonfly]; systems_freebsd = [system_i386_freebsd, @@ -241,10 +241,10 @@ interface systems_aix = [system_powerpc_aix,system_powerpc64_aix]; { all real windows systems, no cripple ones like wince, wdosx et. al. } - systems_windows = [system_i386_win32,system_x86_64_win64,system_ia64_win64]; + systems_windows = [system_i386_win32,system_x86_64_win64]; { all windows systems } - systems_all_windows = [system_i386_win32,system_x86_64_win64,system_ia64_win64, + systems_all_windows = [system_i386_win32,system_x86_64_win64, system_arm_wince,system_i386_wince]; { all darwin systems } @@ -259,7 +259,7 @@ interface { all embedded systems } systems_embedded = [system_i386_embedded,system_m68k_embedded, - system_alpha_embedded,system_powerpc_embedded, + system_powerpc_embedded, system_sparc_embedded,system_vm_embedded, system_iA64_embedded,system_x86_64_embedded, system_mips_embedded,system_arm_embedded, @@ -305,8 +305,7 @@ interface system_i386_Netware, system_i386_netwlibc, system_arm_wince, - system_x86_64_win64, - system_ia64_win64]+systems_linux+systems_android; + system_x86_64_win64]+systems_linux+systems_android; { all systems for which weak linking has been tested/is supported } systems_weak_linking = systems_darwin + systems_solaris + systems_linux + systems_android; @@ -835,14 +834,6 @@ begin {$endif cpu68} {$endif m68k} -{$ifdef alpha} - {$ifdef cpualpha} - default_target(source_info.system); - {$else cpualpha} - default_target(system_alpha_linux); - {$endif cpualpha} -{$endif alpha} - {$ifdef powerpc} {$ifdef cpupowerpc} default_target(source_info.system); diff --git a/compiler/systems/i_linux.pas b/compiler/systems/i_linux.pas index d1a4bb946f..24fb852375 100644 --- a/compiler/systems/i_linux.pas +++ b/compiler/systems/i_linux.pas @@ -359,70 +359,6 @@ unit i_linux; llvmdatalayout : 'E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:64:64-v128:128:128-n32:64'; ); - system_alpha_linux_info : tsysteminfo = - ( - system : system_alpha_LINUX; - name : 'Linux for Alpha'; - shortname : 'Linux'; - flags : [tf_needs_symbol_size,tf_needs_symbol_type,tf_files_case_sensitive, - tf_smartlink_library,tf_has_winlike_resources]; - cpu : cpu_alpha; - unit_env : 'LINUXUNITS'; - extradefines : 'UNIX;HASUNIX'; - exeext : ''; - defext : '.def'; - scriptext : '.sh'; - smartext : '.sl'; - unitext : '.ppu'; - unitlibext : '.ppl'; - asmext : '.s'; - objext : '.o'; - resext : '.res'; - resobjext : '.or'; - sharedlibext : '.so'; - staticlibext : '.a'; - staticlibprefix : 'libp'; - sharedlibprefix : 'lib'; - sharedClibext : '.so'; - staticClibext : '.a'; - staticClibprefix : 'lib'; - sharedClibprefix : 'lib'; - importlibprefix : 'libimp'; - importlibext : '.a'; - Cprefix : ''; - newline : #10; - dirsep : '/'; - assem : as_gas; - assemextern : as_gas; - link : ld_none; - linkextern : ld_linux; - ar : ar_gnu_ar; - res : res_elf; - dbg : dbg_stabs; - script : script_unix; - endian : endian_little; - alignment : - ( - procalign : 4; - loopalign : 4; - jumpalign : 0; - constalignmin : 0; - constalignmax : 4; - varalignmin : 0; - varalignmax : 4; - localalignmin : 4; - localalignmax : 4; - recordalignmin : 0; - recordalignmax : 2; - maxCrecordalign : 4 - ); - first_parm_offset : 8; - stacksize : 32*1024*1024; - stackalign : 8; { ??? } - abi : abi_default; - llvmdatalayout : 'todo'; - ); - system_x86_64_linux_info : tsysteminfo = ( system : system_x86_64_LINUX; @@ -1047,11 +983,6 @@ initialization set_source_info(system_x86_64_linux_info); {$endif linux} {$endif CPUX86_64} -{$ifdef CPUALPHA} - {$ifdef linux} - set_source_info(system_alpha_linux_info); - {$endif linux} -{$endif CPUALPHA} {$ifdef CPUSPARC} {$ifdef linux} set_source_info(system_sparc_linux_info); diff --git a/compiler/systems/t_linux.pas b/compiler/systems/t_linux.pas index a4f7373af8..4e20ccef98 100644 --- a/compiler/systems/t_linux.pas +++ b/compiler/systems/t_linux.pas @@ -1785,11 +1785,6 @@ initialization RegisterExport(system_powerpc64_linux,texportliblinux); RegisterTarget(system_powerpc64_linux_info); {$endif powerpc64} -{$ifdef alpha} - RegisterImport(system_alpha_linux,timportliblinux); - RegisterExport(system_alpha_linux,texportliblinux); - RegisterTarget(system_alpha_linux_info); -{$endif alpha} {$ifdef x86_64} RegisterImport(system_x86_64_linux,timportliblinux); RegisterExport(system_x86_64_linux,texportliblinux); diff --git a/compiler/version.pas b/compiler/version.pas index cfe728e329..03fefdef9e 100644 --- a/compiler/version.pas +++ b/compiler/version.pas @@ -53,21 +53,12 @@ interface {$ifdef cpum68k} source_cpu_string = 'm68k'; {$endif cpum68k} -{$ifdef cpuia64} - source_cpu_string = 'ia64'; -{$endif cpuia64} {$ifdef cpux86_64} source_cpu_string = 'x86_64'; {$endif cpux86_64} {$ifdef cpusparc} source_cpu_string = 'sparc'; {$endif cpusparc} -{$ifdef cpusalpha} - source_cpu_string = 'alpha'; -{$endif cpualpha} -{$ifdef cpuvis} - source_cpu_string = 'vis'; -{$endif cpuvis} {$ifdef cpuarm} source_cpu_string = 'arm'; {$endif cpuarm}