commit f110e4d2625a88e71e998c3353fd84fad18e5b37
author Nicolas Capens <capn@google.com> Wed May 03 15:33:49 2017 -0400
committer Nicolas Capens <capn@google.com> Wed May 03 20:39:21 2017 +0000
tree 1cea6df361dce1cf8128b047483623a5c1c8171e
parent b8afba1c92fb10e54ca7984c46a480b29f300628

Unconditionally compile relocation code.

This fixes a pedantic warning about 'patchSite' being an unused variable.

Change-Id: I2540461fb3da98cebf94350f731fe452e9768b8f
Reviewed-on: https://swiftshader-review.googlesource.com/9610
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/Reactor/SubzeroReactor.cpp

diff --git a/src/Reactor/SubzeroReactor.cpp b/src/Reactor/SubzeroReactor.cpp
index c1d7cb9..8dbec01 100644
--- a/src/Reactor/SubzeroReactor.cpp
+++ b/src/Reactor/SubzeroReactor.cpp
@@ -244,7 +244,33 @@
 			}
 		}
 
-		#if defined(__i386__)
+		if(CPUID::ARM)
+		{
+			switch(relocation.getType())
+			{
+			case R_ARM_NONE:
+				// No relocation
+				break;
+			case R_ARM_MOVW_ABS_NC:
+				{
+					uint32_t thumb = 0;   // Calls to Thumb code not supported.
+					uint32_t lo = (uint32_t)(intptr_t)symbolValue | thumb;
+					*patchSite = (*patchSite & 0xFFF0F000) | ((lo & 0xF000) << 4) | (lo & 0x0FFF);
+				}
+				break;
+			case R_ARM_MOVT_ABS:
+				{
+					uint32_t hi = (uint32_t)(intptr_t)(symbolValue) >> 16;
+					*patchSite = (*patchSite & 0xFFF0F000) | ((hi & 0xF000) << 4) | (hi & 0x0FFF);
+				}
+				break;
+			default:
+				assert(false && "Unsupported relocation type");
+				return nullptr;
+			}
+		}
+		else
+		{
 			switch(relocation.getType())
 			{
 			case R_386_NONE:
@@ -260,30 +286,8 @@
 				assert(false && "Unsupported relocation type");
 				return nullptr;
 			}
-		#elif defined(__arm__)
-			switch(relocation.getType())
-			{
-			case R_ARM_NONE:
-				// No relocation
-				break;
-			case R_ARM_MOVW_ABS_NC:
-				{
-					uint32_t thumb = 0;   // Calls to Thumb code not supported.
-					uint32_t lo = (uint32_t)symbolValue | thumb;
-					*patchSite = (*patchSite & 0xFFF0F000) | ((lo & 0xF000) << 4) | (lo & 0x0FFF);
-				}
-				break;
-			case R_ARM_MOVT_ABS:
-				{
-					uint32_t hi = (uint32_t)(symbolValue) >> 16;
-					*patchSite = (*patchSite & 0xFFF0F000) | ((hi & 0xF000) << 4) | (hi & 0x0FFF);
-				}
-				break;
-			default:
-				assert(false && "Unsupported relocation type");
-				return nullptr;
-			}
-		#endif
+		}
+
 
 		return symbolValue;
 	}
@@ -325,26 +329,24 @@
 			}
 		}
 
-		#if defined(__x86_64__)
-			switch(relocation.getType())
-			{
-			case R_X86_64_NONE:
-				// No relocation
-				break;
-			case R_X86_64_64:
-				*(int64_t*)patchSite = (int64_t)((intptr_t)symbolValue + *(int64_t*)patchSite) + relocation.r_addend;
-				break;
-			case R_X86_64_PC32:
-				*patchSite = (int32_t)((intptr_t)symbolValue + *patchSite - (intptr_t)patchSite) + relocation.r_addend;
-				break;
-			case R_X86_64_32S:
-				*patchSite = (int32_t)((intptr_t)symbolValue + *patchSite) + relocation.r_addend;
-				break;
-			default:
-				assert(false && "Unsupported relocation type");
-				return nullptr;
-			}
-		#endif
+		switch(relocation.getType())
+		{
+		case R_X86_64_NONE:
+			// No relocation
+			break;
+		case R_X86_64_64:
+			*(int64_t*)patchSite = (int64_t)((intptr_t)symbolValue + *(int64_t*)patchSite) + relocation.r_addend;
+			break;
+		case R_X86_64_PC32:
+			*patchSite = (int32_t)((intptr_t)symbolValue + *patchSite - (intptr_t)patchSite) + relocation.r_addend;
+			break;
+		case R_X86_64_32S:
+			*patchSite = (int32_t)((intptr_t)symbolValue + *patchSite) + relocation.r_addend;
+			break;
+		default:
+			assert(false && "Unsupported relocation type");
+			return nullptr;
+		}
 
 		return symbolValue;
 	}