Skip to content

P
proview
Commit fb2e7ec9 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

ARM64 defined

parent 804c0fd4
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 8 deletions
src/exp/inc/src/pwr_class.h
View file @ fb2e7ec9
......@@ -659,7 +659,8 @@ typedef enum {
pwr_mOpSys_X86_64_OPENBSD = 1 << 11,
pwr_mOpSys_X86_CYGWIN = 1 << 12,
pwr_mOpSys_X86_64_CYGWIN = 1 << 13,
pwr_mOpSys_ = 1 << 14,
pwr_mOpSys_ARM64_LINUX = 1 << 14,
pwr_mOpSys_ = 1 << 15,
pwr_mOpSys_VAX_ELN = 1 << 30 /* TODO Remove! */
} pwr_mOpSys;
......
src/lib/co/src/co_cdh.c
View file @ fb2e7ec9
......@@ -2837,6 +2837,7 @@ char *cdh_OpSysToStr( pwr_mOpSys opsys)
case pwr_mOpSys_X86_64_LINUX: strcpy( str, "x86_64_linux"); break;
case pwr_mOpSys_X86_64_MACOS: strcpy( str, "x86_64_macos"); break;
case pwr_mOpSys_ARM_LINUX: strcpy( str, "arm_linux"); break;
case pwr_mOpSys_ARM64_LINUX: strcpy( str, "arm64_linux"); break;
case pwr_mOpSys_X86_64_FREEBSD: strcpy( str, "x86_64_freebsd"); break;
case pwr_mOpSys_X86_64_OPENBSD: strcpy( str, "x86_64_openbsd"); break;
case pwr_mOpSys_X86_CYGWIN: strcpy( str, "x86_cygwin"); break;
......@@ -2867,6 +2868,7 @@ char *cdh_OpSysToDirStr( pwr_mOpSys opsys)
case pwr_mOpSys_X86_64_LINUX: strcpy( str, "os_linux/hw_x86_64"); break;
case pwr_mOpSys_X86_64_MACOS: strcpy( str, "os_macos/hw_x86_64"); break;
case pwr_mOpSys_ARM_LINUX: strcpy( str, "os_linux/hw_arm"); break;
case pwr_mOpSys_ARM64_LINUX: strcpy( str, "os_linux/hw_arm64"); break;
case pwr_mOpSys_X86_64_FREEBSD: strcpy( str, "os_freebsd/hw_x86_64"); break;
case pwr_mOpSys_X86_64_OPENBSD: strcpy( str, "os_openbsd/hw_x86_64"); break;
case pwr_mOpSys_X86_CYGWIN: strcpy( str, "os_cygwin/hw_x86"); break;
......
src/lib/rt/src/rt_rtt_edit.c
View file @ fb2e7ec9
......@@ -868,6 +868,8 @@ static int save_func( edit_ctx ctx,
opsys = pwr_mOpSys_X86_64_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM64_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM64_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "X86_64_MACOS", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_X86_64_MACOS;
else if ( cdh_NoCaseStrncmp( arg1_str, "X86_64_FREEBSD", strlen( arg1_str)) == 0)
......@@ -930,7 +932,9 @@ static int save_func( edit_ctx ctx,
opsys = pwr_mOpSys_X86_64_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM_MACOS", strlen( arg1_str)) == 0)
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM64_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM64_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "X86_64_MACOS", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_X86_64_MACOS;
else if ( cdh_NoCaseStrncmp( arg1_str, "X86_64_FREEBSD", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_X86_64_FREEBSD;
......@@ -1041,6 +1045,8 @@ static int generate_func( edit_ctx ctx,
opsys = pwr_mOpSys_X86_64_FREEBSD;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM64_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM64_LINUX;
else
{
rtt_message('E', "Unknown platform");
......@@ -1786,6 +1792,8 @@ static int dtt_link_func( edit_ctx ctx,
opsys = pwr_mOpSys_X86_64_FREEBSD;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM64_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM64_LINUX;
else
{
rtt_message('E', "Unknown platform");
......@@ -1896,6 +1904,8 @@ static int dtt_compile_func( edit_ctx ctx,
opsys = pwr_mOpSys_X86_64_FREEBSD;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM_LINUX;
else if ( cdh_NoCaseStrncmp( arg1_str, "ARM64_LINUX", strlen( arg1_str)) == 0)
opsys = pwr_mOpSys_ARM64_LINUX;
else
{
rtt_message('E', "Unknown platform");
......@@ -7809,6 +7819,8 @@ int dtt_start( char *programname)
dtt_current_opsys = pwr_mOpSys_X86_64_LINUX;
else if ( strcmp( rtt_hw, "arm") == 0)
dtt_current_opsys = pwr_mOpSys_ARM_LINUX;
else if ( strcmp( rtt_hw, "arm64") == 0)
dtt_current_opsys = pwr_mOpSys_ARM64_LINUX;
else
dtt_current_opsys = pwr_mOpSys_PPC_LINUX;
#elif defined OS_MACOS
......@@ -10651,6 +10663,7 @@ static char *dtt_opsys_to_name( int opsys)
case pwr_mOpSys_X86_LINUX: strcpy( name, "X86_LINUX"); break;
case pwr_mOpSys_X86_64_LINUX: strcpy( name, "X86_64_LINUX"); break;
case pwr_mOpSys_ARM_LINUX: strcpy( name, "ARM_LINUX"); break;
case pwr_mOpSys_ARM64_LINUX: strcpy( name, "ARM64_LINUX"); break;
case pwr_mOpSys_X86_64_MACOS: strcpy( name, "X86_64_MACOS"); break;
case pwr_mOpSys_X86_64_FREEBSD: strcpy( name, "X86_64_FREEBSD"); break;
case pwr_mOpSys_X86_64_OPENBSD: strcpy( name, "X86_64_OPENBSD"); break;
......
src/wbl/pwrs/src/pwrs_td_opsysenum.wb_load
View file @ fb2e7ec9
......@@ -177,5 +177,15 @@ SObject pwrs:Type
Attr Value = 4096
EndBody
EndObject
!/**
! Operating system is Linux on ARM64
!*/
Object ARM64_Linux $Value
Body SysBody
Attr PgmName = "ARM64_LINUX"
Attr Text = "Linux on ARM64"
Attr Value = 8192
EndBody
EndObject
EndObject
EndSObject
src/wbl/pwrs/src/pwrs_td_opsysmask.wb_load
View file @ fb2e7ec9
......@@ -141,11 +141,11 @@ SObject pwrs:Type
EndBody
EndObject
!/**
! Operating system is ARM on x86
! Operating system is Linux on ARM
!*/
Object ARM_LINUX $Bit
Body SysBody
Attr PgmName = "ARM_X86"
Attr PgmName = "ARM_LINUX"
Attr Text = "Linux on ARM"
Attr Value = 512
EndBody
......@@ -180,5 +180,15 @@ SObject pwrs:Type
Attr Value = 4096
EndBody
EndObject
!/**
! Operating system is Linux on ARM64
!*/
Object ARM64_LINUX $Bit
Body SysBody
Attr PgmName = "ARM64_LINUX"
Attr Text = "Linux on ARM64"
Attr Value = 8192
EndBody
EndObject
EndObject
EndSObject
wb/exp/com/src/os_linux/wb_gcg.sh
View file @ fb2e7ec9
......@@ -276,9 +276,10 @@ let OpSys_ARM_LINUX=10
let OpSys_X86_64_FREEBSD=11
let OpSys_X86_64_OPENBSD=12
let OpSys_X86_CYGWIN=13
let OpSys__High=14
let OpSys_ARM64_LINUX=14
let OpSys__High=15
vOpSys="custombuild,vax_vms,axp_vms,ppc_lynx,x86_lynx,ppc_linux,x86_linux,x86_64_linux,x86_64_macos,arm_linux,x86_64_freebsd,x86_64_openbsd,x86_cygwin"
vOpSys="custombuild,vax_vms,axp_vms,ppc_lynx,x86_lynx,ppc_linux,x86_linux,x86_64_linux,x86_64_macos,arm_linux,x86_64_freebsd,x86_64_openbsd,x86_cygwin,arm64_linux"
let FileType__Low=-1
let FileType_Process=0
......
wb/lib/wb/src/wb_gcg.cpp
View file @ fb2e7ec9
......@@ -133,6 +133,7 @@ extern "C" {
|| (os & pwr_mOpSys_X86_LINUX) \
|| (os & pwr_mOpSys_X86_64_LINUX) \
|| (os & pwr_mOpSys_ARM_LINUX) \
|| (os & pwr_mOpSys_ARM64_LINUX) \
|| (os & pwr_mOpSys_CustomBuild))
#define IS_UNIX(os) (IS_LINUX(os) || IS_LYNX(os) || IS_MACOS(os) || IS_FREEBSD(os) || IS_OPENBSD(os) || IS_CYGWIN(os))
......@@ -860,6 +861,8 @@ static pwr_tStatus gcg_get_build_host(
strcpy(logname, "pwr_build_host_x86_64_linux");
else if (os & pwr_mOpSys_ARM_LINUX)
strcpy(logname, "pwr_build_host_arm_linux");
else if (os & pwr_mOpSys_ARM64_LINUX)
strcpy(logname, "pwr_build_host_arm64_linux");
else if (os & pwr_mOpSys_X86_64_MACOS)
strcpy(logname, "pwr_build_host_x86_64_macos");
else if (os & pwr_mOpSys_X86_64_FREEBSD)
......@@ -5622,6 +5625,11 @@ int gcg_comp_rtnode(
strcpy( os_str, "ARM_LINUX"); /* Not used */
max_no_timebase = GCG_MAX_NO_TIMEBASE_LINUX;
break;
case pwr_mOpSys_ARM64_LINUX:
strcpy( objdir, "xxx");
strcpy( os_str, "ARM64_LINUX"); /* Not used */
max_no_timebase = GCG_MAX_NO_TIMEBASE_LINUX;
break;
case pwr_mOpSys_X86_64_MACOS:
strcpy( objdir, "xxx");
strcpy( os_str, "X86_64_MACOS"); /* Not used */
......@@ -5876,6 +5884,7 @@ int gcg_comp_rtnode(
case pwr_mOpSys_X86_LINUX:
case pwr_mOpSys_X86_64_LINUX:
case pwr_mOpSys_ARM_LINUX:
case pwr_mOpSys_ARM64_LINUX:
case pwr_mOpSys_X86_64_MACOS:
case pwr_mOpSys_X86_64_FREEBSD:
case pwr_mOpSys_X86_64_OPENBSD:
......
wb/lib/wb/src/wb_lfu.cpp
View file @ fb2e7ec9
......@@ -2938,7 +2938,8 @@ pwr_tStatus lfu_SaveDirectoryVolume(
// Print custom build file
if ( !( opsys == pwr_mOpSys_PPC_LINUX ||
opsys == pwr_mOpSys_X86_LINUX ||
opsys == pwr_mOpSys_ARM_LINUX))
opsys == pwr_mOpSys_ARM_LINUX ||
opsys == pwr_mOpSys_ARM64_LINUX))
continue;
sprintf( fname, pwr_cNameCustomBuild);
......@@ -2954,7 +2955,8 @@ pwr_tStatus lfu_SaveDirectoryVolume(
fprintf( fp, "#!/bin/bash\n\n");
fprintf( fp, "let OpSys_PPC_LINUX=32\n");
fprintf( fp, "let OpSys_X86_LINUX=64\n");
fprintf( fp, "let OpSys_ARM_LINUX=512\n\n");
fprintf( fp, "let OpSys_ARM_LINUX=512\n");
fprintf( fp, "let OpSys_ARM64_LINUX=8192\n\n");
switch ( opsys) {
case pwr_mOpSys_PPC_LINUX:
......@@ -2966,6 +2968,9 @@ pwr_tStatus lfu_SaveDirectoryVolume(
case pwr_mOpSys_ARM_LINUX:
strcpy( expdir, "os_linux/hw_arm");
break;
case pwr_mOpSys_ARM64_LINUX:
strcpy( expdir, "os_linux/hw_arm64");
break;
default: ;
strcpy( expdir, "");
}
......@@ -3011,6 +3016,9 @@ pwr_tStatus lfu_SaveDirectoryVolume(
case pwr_mOpSys_ARM_LINUX:
fprintf( fp, "$pwrb_root/os_linux/hw_arm/exp/exe/wb_gcg.sh \"$1\" \"$2\" \"$3\" \"$OpSys_ARM_LINUX\" \"$5\" \"$6\" \"$7\" \"$8\"\n");
break;
case pwr_mOpSys_ARM64_LINUX:
fprintf( fp, "$pwrb_root/os_linux/hw_arm64/exp/exe/wb_gcg.sh \"$1\" \"$2\" \"$3\" \"$OpSys_ARM64_LINUX\" \"$5\" \"$6\" \"$7\" \"$8\"\n");
break;
default: ;
}
fclose(fp);
......@@ -3593,6 +3601,7 @@ pwr_tStatus lfu_check_opt_file( ldh_tSesContext ldhses, char *nodename, int bus_
case pwr_mOpSys_X86_LINUX:
case pwr_mOpSys_X86_64_LINUX:
case pwr_mOpSys_ARM_LINUX:
case pwr_mOpSys_ARM64_LINUX:
case pwr_mOpSys_X86_64_MACOS:
case pwr_mOpSys_CustomBuild:
fp <<
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7