From 56df27502c17d29984474918cb3b8850671d8f39 Mon Sep 17 00:00:00 2001
From: Christian Jullien <Christian Jullien>
Date: Mon, 8 May 2017 09:18:27 +0200
Subject: [PATCH] C string litteral is const, fix return type of
 default_elfinterp. Remove #ifndef TCC_IS_NATIVE in arm-gen.c as suggested by
 grischka.

---
 arm-gen.c | 6 +++---
 tcc.h     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arm-gen.c b/arm-gen.c
index 809352c4..d11b1ece 100644
--- a/arm-gen.c
+++ b/arm-gen.c
@@ -203,7 +203,7 @@ static int regmask(int r) {
 /******************************************************/
 
 #if defined(TCC_ARM_EABI) && !defined(CONFIG_TCC_ELFINTERP)
-char *default_elfinterp(struct TCCState *s)
+const char *default_elfinterp(struct TCCState *s)
 {
     if (s->float_abi == ARM_HARD_FLOAT)
         return "/lib/ld-linux-armhf.so.3";
@@ -2150,6 +2150,6 @@ ST_FUNC void gen_vla_alloc(CType *type, int align) {
 #endif
 /*************************************************************/
 
-#ifndef TCC_IS_NATIVE
+// #ifndef TCC_IS_NATIVE
 #include "arm-asm.c"
-#endif
+// #endif
diff --git a/tcc.h b/tcc.h
index 596ee252..66276187 100644
--- a/tcc.h
+++ b/tcc.h
@@ -1534,7 +1534,7 @@ ST_FUNC void gen_opl(int op);
 /* ------------ arm-gen.c ------------ */
 #ifdef TCC_TARGET_ARM
 #if defined(TCC_ARM_EABI) && !defined(CONFIG_TCC_ELFINTERP)
-PUB_FUNC char *default_elfinterp(struct TCCState *s);
+PUB_FUNC const char *default_elfinterp(struct TCCState *s);
 #endif
 ST_FUNC void arm_init(struct TCCState *s);
 ST_FUNC void gen_cvt_itof1(int t);
-- 
2.11.4.GIT