[Pal] Build DkSegmentRegister() only on x86_64 and adapt Symbols test

gramineproject · Jun 26, 2020 · fd22ef2 · fd22ef2
1 parent 6ea528b
commit fd22ef2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/Pal/regression/Symbols.c b/Pal/regression/Symbols.c
@@ -58,7 +58,9 @@ int main(int argc, char** argv, char** envp) {
     PRINT_SYMBOL(DkSystemTimeQuery);
     PRINT_SYMBOL(DkRandomBitsRead);
     PRINT_SYMBOL(DkInstructionCacheFlush);
+#if defined(__x86_64__)
     PRINT_SYMBOL(DkSegmentRegister);
+#endif
     PRINT_SYMBOL(DkMemoryAvailableQuota);
 
     return 0;

diff --git a/Pal/regression/test_pal.py b/Pal/regression/test_pal.py
@@ -14,6 +14,7 @@
 
 from regression import (
     HAS_SGX,
+    ON_X86,
     RegressionTestCase,
     expectedFailureIf,
 )
@@ -293,9 +294,10 @@ class TC_02_Symbols(RegressionTestCase):
         'DkSystemTimeQuery',
         'DkRandomBitsRead',
         'DkInstructionCacheFlush',
-        'DkSegmentRegister',
         'DkMemoryAvailableQuota',
     ]
+    if ON_X86:
+        ALL_SYMBOLS.append('DkSegmentRegister')
 
     def test_000_symbols(self):
         _, stderr = self.run_binary(['Symbols'])

diff --git a/Pal/src/db_misc.c b/Pal/src/db_misc.c
@@ -27,6 +27,7 @@ PAL_NUM DkRandomBitsRead(PAL_PTR buffer, PAL_NUM size) {
     LEAVE_PAL_CALL_RETURN(ret);
 }
 
+#if defined(__x86_64__)
 PAL_PTR DkSegmentRegister(PAL_FLG reg, PAL_PTR addr) {
     ENTER_PAL_CALL(DkSegmentRegister);
     void* seg_addr = (void*)addr;
@@ -45,6 +46,7 @@ PAL_PTR DkSegmentRegister(PAL_FLG reg, PAL_PTR addr) {
 
     LEAVE_PAL_CALL_RETURN((PAL_PTR)seg_addr);
 }
+#endif
 
 PAL_BOL DkInstructionCacheFlush(PAL_PTR addr, PAL_NUM size) {
     ENTER_PAL_CALL(DkInstructionCacheFlush);

diff --git a/Scripts/regression.py b/Scripts/regression.py
@@ -6,6 +6,7 @@
 import unittest
 
 HAS_SGX = os.environ.get('SGX') == '1'
+ON_X86 = os.uname().machine in ['x86_64']
 
 def expectedFailureIf(predicate):
     if predicate: