diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index ce45f2980abf0aac7b699b5129ac490b453d091f..1d29d2129173c27d7a2516a1db2f20b3a5532b26 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -773,21 +773,10 @@ void gdb_str_to_target(target_t *target, char *tstr, reg_t *reg)
 	buf = reg->value;
 	buf_len = CEIL(reg->size, 8);
 
-	if (target->endianness == TARGET_LITTLE_ENDIAN)
+	for (i = 0; i < buf_len; i++)
 	{
-		for (i = 0; i < buf_len; i++)
-		{
-			tstr[i*2]   = DIGITS[(buf[i]>>4) & 0xf];
-			tstr[i*2+1] = DIGITS[buf[i]&0xf];
-		}
-	}
-	else
-	{
-		for (i = 0; i < buf_len; i++)
-		{
-			tstr[(buf_len-1-i)*2]   = DIGITS[(buf[i]>>4)&0xf];
-			tstr[(buf_len-1-i)*2+1] = DIGITS[buf[i]&0xf];
-		}
+		tstr[i*2]   = DIGITS[(buf[i]>>4) & 0xf];
+		tstr[i*2+1] = DIGITS[buf[i]&0xf];
 	}
 }
 
@@ -802,20 +791,10 @@ void gdb_target_to_str(target_t *target, char *tstr, char *str)
 		exit(-1);
 	}
 
-	if (target->endianness == TARGET_LITTLE_ENDIAN)
+	for (i = 0; i < str_len; i+=2)
 	{
-		for (i = 0; i < str_len; i+=2)
-		{
-			str[str_len - i - 1] = tstr[i + 1];
-			str[str_len - i - 2] = tstr[i];
-		}
-	}
-	else
-	{
-		for (i = 0; i < str_len; i++)
-		{
-			str[i] = tstr[i];
-		}
+		str[str_len - i - 1] = tstr[i + 1];
+		str[str_len - i - 2] = tstr[i];
 	}
 }