Skip to content
GitLab
Commit 1c195e70 authored by yoogx's avatar yoogx
Browse files

* Only define Linux_DLL platform, instead of 32/64 bits 

          variants.

          For openaadl/ocarina#162
parent 8251f2fc
Hide whitespace changes
Inline Side-by-side
resources/deployment.aadl
View file @ 1c195e70
......@@ -31,11 +31,10 @@ property set Deployment is
LEON3_XM3, -- RTEMS for XTRATUM/LEON3
LEON_GNAT, -- LEON2 board or qemu (GNATPRO/HI-E)
LINUX32, -- Linux 32 bits
LINUX32_DLL, -- Linux 32 bits/Dynamic Library
LINUX_DLL, -- Linux Dynamic Library
LINUX32_XENOMAI_NATIVE, -- Linux 32 bits with native Xenomai
LINUX32_XENOMAI_POSIX, -- Linux 32 bits with Xenomai and POSIX skin
LINUX64, -- Linux 64 bits
LINUX64_DLL, -- Linux 64 bits/Dynamic Library
ERC32_ORK, -- ERC32 board or tsim-erc32 (ORK)
X86_RTEMS_POSIX, -- x86 under RTEMS with POSIX layer
X86_LINUXTASTE, -- TASTE-specific linux distribution
......
src/backends/ocarina-backends-properties.adb
View file @ 1c195e70
......@@ -313,12 +313,11 @@ package body Ocarina.Backends.Properties is
Platform_Bench_Name : Name_Id;
Platform_Native_Compcert_Name : Name_Id;
Platform_LINUX32_Name : Name_Id;
Platform_LINUX32_DLL_Name : Name_Id;
Platform_Linux_DLL_Name : Name_Id;
Platform_Win32_Name : Name_Id;
Platform_LINUX32_Xenomai_Native_Name : Name_Id;
Platform_LINUX32_Xenomai_Posix_Name : Name_Id;
Platform_LINUX64_Name : Name_Id;
Platform_LINUX64_DLL_Name : Name_Id;
Platform_LEON_RTEMS_Name : Name_Id;
Platform_LEON_RTEMS_POSIX_Name : Name_Id;
Platform_X86_LINUXTASTE_Name : Name_Id;
......@@ -2447,8 +2446,8 @@ package body Ocarina.Backends.Properties is
return Platform_X86_LINUXTASTE;
elsif P_Name = Platform_LINUX32_Name then
return Platform_LINUX32;
elsif P_Name = Platform_LINUX32_DLL_Name then
return Platform_LINUX32_DLL;
elsif P_Name = Platform_LINUX_DLL_Name then
return Platform_LINUX_DLL;
elsif P_Name = Platform_Win32_Name then
return Platform_WIN32;
elsif P_Name = Platform_LINUX32_Xenomai_Native_Name then
......@@ -2457,8 +2456,6 @@ package body Ocarina.Backends.Properties is
return Platform_LINUX32_XENOMAI_POSIX;
elsif P_Name = Platform_LINUX64_Name then
return Platform_LINUX64;
elsif P_Name = Platform_LINUX64_DLL_Name then
return Platform_LINUX64_DLL;
elsif P_Name = Platform_LEON_GNAT_Name then
return Platform_LEON_GNAT;
elsif P_Name = Platform_LEON_ORK_Name then
......@@ -3023,14 +3020,13 @@ package body Ocarina.Backends.Properties is
Platform_Bench_Name := Get_String_Name ("bench");
Platform_Native_Compcert_Name := Get_String_Name ("native_compcert");
Platform_LINUX32_Name := Get_String_Name ("linux32");
Platform_LINUX32_DLL_Name := Get_String_Name ("linux32_dll");
Platform_LINUX_DLL_Name := Get_String_Name ("linux_dll");
Platform_Win32_Name := Get_String_Name ("win32");
Platform_LINUX32_Xenomai_Native_Name :=
Get_String_Name ("linux32_xenomai_native");
Platform_LINUX32_Xenomai_Posix_Name :=
Get_String_Name ("linux32_xenomai_posix");
Platform_LINUX64_Name := Get_String_Name ("linux64");
Platform_LINUX64_DLL_Name := Get_String_Name ("linux64_dll");
Platform_X86_LINUXTASTE_Name := Get_String_Name ("x86_linuxtaste");
Platform_LEON_RTEMS_Name := Get_String_Name ("leon_rtems");
Platform_LEON_RTEMS_POSIX_Name := Get_String_Name ("leon_rtems_posix");
......
src/backends/ocarina-backends-properties.ads
View file @ 1c195e70
......@@ -553,11 +553,10 @@ package Ocarina.Backends.Properties is
Platform_LEON_ORK,
Platform_WIN32,
Platform_LINUX32,
Platform_LINUX32_DLL,
Platform_LINUX_DLL,
Platform_LINUX32_XENOMAI_NATIVE,
Platform_LINUX32_XENOMAI_POSIX,
Platform_LINUX64,
Platform_LINUX64_DLL,
Platform_ERC32_ORK,
Platform_MARTE_OS,
Platform_VxWorks,
......
src/backends/po_hi_c/ocarina-backends-po_hi_c.adb
View file @ 1c195e70
......@@ -216,11 +216,8 @@ package body Ocarina.Backends.PO_HI_C is
when Platform_LINUX32 =>
Write_Str ("linux32");
when Platform_LINUX64_DLL =>
Write_Str ("linux64_dll");
when Platform_LINUX32_DLL =>
Write_Str ("linux32_dll");
when Platform_LINUX_DLL =>
Write_Str ("linux_dll");
when Platform_WIN32 =>
Write_Str ("win32");
......
tests/real-annexes-parsing/test_real_parse_01.aadl.out
View file @ 1c195e70
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
tests/real-annexes-parsing/test_real_parse_02.aadl.out
View file @ 1c195e70
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
tests/real-annexes-parsing/test_real_parse_03.aadl.out
View file @ 1c195e70
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
tests/real-annexes-parsing/test_real_parse_04.aadl.out
View file @ 1c195e70
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
tests/real-annexes-parsing/test_real_parse_05.aadl.out
View file @ 1c195e70
......@@ -78,7 +78,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
tests/test042/test.aadl.out
View file @ 1c195e70
......@@ -74,7 +74,7 @@ property set Deployment is
Protocol : Deployment::Protocol_Type
applies to (system);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX32_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, LINUX64_DLL, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Allowed_Execution_Platform : type enumeration (Native, Native_Compcert, bench, GNAT_Runtime, LEON_ORK, LEON_RTEMS, LEON_RTEMS_POSIX, LEON3_SCOC3, LEON3_XTRATUM, LEON3_XM3, LEON_GNAT, LINUX32, LINUX_DLL, LINUX32_XENOMAI_NATIVE, LINUX32_XENOMAI_POSIX, LINUX64, ERC32_ORK, X86_RTEMS_POSIX, X86_LINUXTASTE, MARTE_OS, WIN32, VXWORKS, FREERTOS, AIR);
Execution_Platform : Deployment::Allowed_Execution_Platform
applies to ( all);
......
Supports Markdown
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