diff options
| author | Andrey Churbanov <Andrey.Churbanov@intel.com> | 2015-01-13 14:43:35 +0000 |
|---|---|---|
| committer | Andrey Churbanov <Andrey.Churbanov@intel.com> | 2015-01-13 14:43:35 +0000 |
| commit | 889547d5893d556277c448e3cb0ff87d9299bda8 (patch) | |
| tree | 8ad20deefe90a0b069f031fa84fef40bbd529b13 /runtime/tools | |
| parent | 8e3bb6f34da389f0f8f8c536dc23272446171079 (diff) | |
aarch64 port sent by C. Bergstrom
git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@225792 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime/tools')
| -rw-r--r-- | runtime/tools/lib/Platform.pm | 6 | ||||
| -rw-r--r-- | runtime/tools/lib/Uname.pm | 2 | ||||
| -rw-r--r-- | runtime/tools/src/common-defs.mk | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/runtime/tools/lib/Platform.pm b/runtime/tools/lib/Platform.pm index 077e649..839e54f 100644 --- a/runtime/tools/lib/Platform.pm +++ b/runtime/tools/lib/Platform.pm @@ -52,6 +52,8 @@ sub canon_arch($) { $arch = "arm"; } elsif ( $arch =~ m{\Appc64} ) { $arch = "ppc64"; + } elsif ( $arch =~ m{\Aaarch64} ) { + $arch = "aarch64"; } else { $arch = undef; }; # if @@ -64,6 +66,7 @@ sub canon_arch($) { "32" => "IA-32 architecture", "32e" => "Intel(R) 64", "arm" => "ARM", + "aarch64" => "AArch64", ); sub legal_arch($) { @@ -82,6 +85,7 @@ sub canon_arch($) { "32e" => "intel64", "64" => "ia64", "arm" => "arm", + "aarch64" => "aarch", ); sub arch_opt($) { @@ -163,6 +167,8 @@ sub target_options() { $_host_arch = "arm"; } elsif ( $hardware_platform eq "ppc64" ) { $_host_arch = "ppc64"; + } elsif ( $hardware_platform eq "aarch64" ) { + $_host_arch = "aarch64"; } else { die "Unsupported host hardware platform: \"$hardware_platform\"; stopped"; }; # if diff --git a/runtime/tools/lib/Uname.pm b/runtime/tools/lib/Uname.pm index 52518b4..d5bbde5 100644 --- a/runtime/tools/lib/Uname.pm +++ b/runtime/tools/lib/Uname.pm @@ -149,6 +149,8 @@ if ( 0 ) { $values{ hardware_platform } = "arm"; } elsif ( $values{ machine } =~ m{\Appc64\z} ) { $values{ hardware_platform } = "ppc64"; + } elsif ( $values{ machine } =~ m{\Aaarch64\z} ) { + $values{ hardware_platform } = "aarch64"; } else { die "Unsupported machine (\"$values{ machine }\") returned by POSIX::uname(); stopped"; }; # if diff --git a/runtime/tools/src/common-defs.mk b/runtime/tools/src/common-defs.mk index 7eb64b0..f8dd75e 100644 --- a/runtime/tools/src/common-defs.mk +++ b/runtime/tools/src/common-defs.mk @@ -45,7 +45,7 @@ endif # Description: # The function return printable name of specified architecture, IA-32 architecture or Intel(R) 64. # -legal_arch = $(if $(filter 32,$(1)),IA-32,$(if $(filter 32e,$(1)),Intel(R) 64,$(if $(filter l1,$(1)),L1OM,$(if $(filter arm,$(1)),ARM,$(if $(filter ppc64,$(1)),PPC64,$(error Bad architecture specified: $(1))))))) +legal_arch = $(if $(filter 32,$(1)),IA-32,$(if $(filter 32e,$(1)),Intel(R) 64,$(if $(filter l1,$(1)),L1OM,$(if $(filter arm,$(1)),ARM,$(if $(filter ppc64,$(1)),PPC64,$(if $(filter aarch64,$(1)),AArch64,$(error Bad architecture specified: $(1))))))) # Synopsis: # var_name = $(call check_variable,var,list) @@ -128,9 +128,9 @@ endif # -------------------------------------------------------------------------------------------------- os := $(call check_variable,os,lin lrb mac win) -arch := $(call check_variable,arch,32 32e 64 arm ppc64) +arch := $(call check_variable,arch,32 32e 64 arm ppc64 aarch64) platform := $(os)_$(arch) -platform := $(call check_variable,platform,lin_32 lin_32e lin_64 lin_arm lrb_32e mac_32 mac_32e win_32 win_32e win_64 lin_ppc64) +platform := $(call check_variable,platform,lin_32 lin_32e lin_64 lin_arm lrb_32e mac_32 mac_32e win_32 win_32e win_64 lin_ppc64 lin_aarch64) # oa-opts means "os and arch options". They are passed to almost all perl scripts. oa-opts := --os=$(os) --arch=$(arch) |