aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Jullien <Christian Jullien>2017-05-08 09:18:27 +0200
committerChristian Jullien <Christian Jullien>2017-05-08 09:18:27 +0200
commit56df27502c17d29984474918cb3b8850671d8f39 (patch)
tree100c520ff5bcf2d7265fcec999cd893b346ad7df
parent19d8b8a17383863d45823e37f20a94cc1d55c3a6 (diff)
downloadtinycc-56df27502c17d29984474918cb3b8850671d8f39.tar.gz
tinycc-56df27502c17d29984474918cb3b8850671d8f39.tar.bz2
C string litteral is const, fix return type of default_elfinterp. Remove #ifndef TCC_IS_NATIVE in arm-gen.c as suggested by grischka.
-rw-r--r--arm-gen.c6
-rw-r--r--tcc.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/arm-gen.c b/arm-gen.c
index 809352c..d11b1ec 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 596ee25..6627618 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);