github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-01-13 05:10:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow building lib with gcc/clang

Browse Source 
Needed when using ...libtcc1-usegcc=yes in lib/Makefile.

lib/bcheck.c: Add __clang__ for pragma diagnostic
lib/bt-log.c: Add pragma diagnostic as in lib/bcheck.c
lib/builtin.c: Add a lot of alias code to allow building with gcc/clang
lib/stdatomic.c: Same as lib/builtin.c
lib/tcov.c: Avoid clang compiler warning
This commit is contained in:
herman ten brugge 2022-12-17 09:37:37 +01:00
parent d66a62fa6b
commit 04810db83a
5 changed files with 94 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/bcheck.c
View File

@ -622,7 +622,8 @@ BOUND_PTR_INDIR(8)
BOUND_PTR_INDIR(12) BOUND_PTR_INDIR(12)
BOUND_PTR_INDIR(16) BOUND_PTR_INDIR(16)
#if defined(__GNUC__) && (__GNUC__ >= 6) /* Needed when using ...libtcc1-usegcc=yes in lib/Makefile */
#if (defined(__GNUC__) && (__GNUC__ >= 6)) || defined(__clang__)
/* /*
* At least gcc 6.2 complains when __builtin_frame_address is used with * At least gcc 6.2 complains when __builtin_frame_address is used with
* nonzero argument. * nonzero argument.
@ -927,7 +928,7 @@ void __bound_siglongjmp(jmp_buf env, int val)
} }
#endif #endif
#if defined(__GNUC__) && (__GNUC__ >= 6) #if (defined(__GNUC__) && (__GNUC__ >= 6)) || defined(__clang__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

10
lib/bt-log.c
View File

@ -13,6 +13,12 @@ int (*__rt_error)(void*, void*, const char *, va_list);
# define DLL_EXPORT # define DLL_EXPORT
#endif #endif
/* Needed when using ...libtcc1-usegcc=yes in lib/Makefile */
#if (defined(__GNUC__) && (__GNUC__ >= 6)) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wframe-address"
#endif
DLL_EXPORT int tcc_backtrace(const char *fmt, ...) DLL_EXPORT int tcc_backtrace(const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -35,3 +41,7 @@ DLL_EXPORT int tcc_backtrace(const char *fmt, ...)
} }
return ret; return ret;
} }
#if (defined(__GNUC__) && (__GNUC__ >= 6)) || defined(__clang__)
#pragma GCC diagnostic pop
#endif

88
lib/builtin.c
View File

@ -1,3 +1,12 @@
/* uses alias to allow building with gcc/clang */
#ifdef __TINYC__
#define BUILTIN(x) __builtin_##x
#define BUILTINN(x) "__builtin_" # x
#else
#define BUILTIN(x) __tcc_builtin_##x
#define BUILTINN(x) "__tcc_builtin_" # x
#endif
/* ---------------------------------------------- */ /* ---------------------------------------------- */
/* This file implements: /* This file implements:
* __builtin_ffs * __builtin_ffs
@ -66,59 +75,90 @@ static const unsigned char table_2_64[] = {
/* Returns one plus the index of the least significant 1-bit of x, /* Returns one plus the index of the least significant 1-bit of x,
or if x is zero, returns zero. */ or if x is zero, returns zero. */
int __builtin_ffs (int x) { FFSI(x) } int BUILTIN(ffs) (int x) { FFSI(x) }
int BUILTIN(ffsll) (long long x) { FFSL(x) }
#if __SIZEOF_LONG__ == 4 #if __SIZEOF_LONG__ == 4
int __builtin_ffsl (long x) { FFSI(x) } int BUILTIN(ffsl) (long x) __attribute__((alias(BUILTINN(ffs))));
#else #else
int __builtin_ffsl (long x) { FFSL(x) } int BUILTIN(ffsl) (long x) __attribute__((alias(BUILTINN(ffsll))));
#endif #endif
int __builtin_ffsll (long long x) { FFSL(x) }
/* Returns the number of leading 0-bits in x, starting at the most significant /* Returns the number of leading 0-bits in x, starting at the most significant
bit position. If x is 0, the result is undefined. */ bit position. If x is 0, the result is undefined. */
int __builtin_clz (unsigned int x) { CLZI(x) } int BUILTIN(clz) (unsigned int x) { CLZI(x) }
int BUILTIN(clzll) (unsigned long long x) { CLZL(x) }
#if __SIZEOF_LONG__ == 4 #if __SIZEOF_LONG__ == 4
int __builtin_clzl (unsigned long x) { CLZI(x) } int BUILTIN(clzl) (unsigned long x) __attribute__((alias(BUILTINN(clz))));
#else #else
int __builtin_clzl (unsigned long x) { CLZL(x) } int BUILTIN(clzl) (unsigned long x) __attribute__((alias(BUILTINN(clzll))));
#endif #endif
int __builtin_clzll (unsigned long long x) { CLZL(x) }
/* Returns the number of trailing 0-bits in x, starting at the least /* Returns the number of trailing 0-bits in x, starting at the least
significant bit position. If x is 0, the result is undefined. */ significant bit position. If x is 0, the result is undefined. */
int __builtin_ctz (unsigned int x) { CTZI(x) } int BUILTIN(ctz) (unsigned int x) { CTZI(x) }
int BUILTIN(ctzll) (unsigned long long x) { CTZL(x) }
#if __SIZEOF_LONG__ == 4 #if __SIZEOF_LONG__ == 4
int __builtin_ctzl (unsigned long x) { CTZI(x) } int BUILTIN(ctzl) (unsigned long x) __attribute__((alias(BUILTINN(ctz))));
#else #else
int __builtin_ctzl (unsigned long x) { CTZL(x) } int BUILTIN(ctzl) (unsigned long x) __attribute__((alias(BUILTINN(ctzll))));
#endif #endif
int __builtin_ctzll (unsigned long long x) { CTZL(x) }
/* Returns the number of leading redundant sign bits in x, i.e. the number /* Returns the number of leading redundant sign bits in x, i.e. the number
of bits following the most significant bit that are identical to it. of bits following the most significant bit that are identical to it.
There are no special cases for 0 or other values. */ There are no special cases for 0 or other values. */
int __builtin_clrsb (int x) { if (x < 0) x = ~x; x <<= 1; CLZI(x) } int BUILTIN(clrsb) (int x) { if (x < 0) x = ~x; x <<= 1; CLZI(x) }
int BUILTIN(clrsbll) (long long x) { if (x < 0) x = ~x; x <<= 1; CLZL(x) }
#if __SIZEOF_LONG__ == 4 #if __SIZEOF_LONG__ == 4
int __builtin_clrsbl (long x) { if (x < 0) x = ~x; x <<= 1; CLZI(x) } int BUILTIN(clrsbl) (long x) __attribute__((alias(BUILTINN(clrsb))));
#else #else
int __builtin_clrsbl (long x) { if (x < 0) x = ~x; x <<= 1; CLZL(x) } int BUILTIN(clrsbl) (long x) __attribute__((alias(BUILTINN(clrsbll))));
#endif #endif
int __builtin_clrsbll (long long x) { if (x < 0) x = ~x; x <<= 1; CLZL(x) }
/* Returns the number of 1-bits in x.*/ /* Returns the number of 1-bits in x.*/
int __builtin_popcount (unsigned int x) { POPCOUNTI(x, 0x3f) } int BUILTIN(popcount) (unsigned int x) { POPCOUNTI(x, 0x3f) }
int BUILTIN(popcountll) (unsigned long long x) { POPCOUNTL(x, 0x7f) }
#if __SIZEOF_LONG__ == 4 #if __SIZEOF_LONG__ == 4
int __builtin_popcountl (unsigned long x) { POPCOUNTI(x, 0x3f) } int BUILTIN(popcountl) (unsigned long x) __attribute__((alias(BUILTINN(popcount))));
#else #else
int __builtin_popcountl (unsigned long x) { POPCOUNTL(x, 0x7f) } int BUILTIN(popcountl ) (unsigned long x) __attribute__((alias(BUILTINN(popcountll))));
#endif #endif
int __builtin_popcountll (unsigned long long x) { POPCOUNTL(x, 0x7f) }
/* Returns the parity of x, i.e. the number of 1-bits in x modulo 2. */ /* Returns the parity of x, i.e. the number of 1-bits in x modulo 2. */
int __builtin_parity (unsigned int x) { POPCOUNTI(x, 0x01) } int BUILTIN(parity) (unsigned int x) { POPCOUNTI(x, 0x01) }
int BUILTIN(parityll) (unsigned long long x) { POPCOUNTL(x, 0x01) }
#if __SIZEOF_LONG__ == 4 #if __SIZEOF_LONG__ == 4
int __builtin_parityl (unsigned long x) { POPCOUNTI(x, 0x01) } int BUILTIN(parityl) (unsigned long x) __attribute__((alias(BUILTINN(parity))));
#else #else
int __builtin_parityl (unsigned long x) { POPCOUNTL(x, 0x01) } int BUILTIN(parityl) (unsigned long x) __attribute__((alias(BUILTINN(parityll))));
#endif
#ifndef __TINYC__
#if defined(__GNUC__) && (__GNUC__ >= 6)
/* gcc overrides alias from __builtin_ffs... to ffs.. so use assembly code */
__asm__(".globl __builtin_ffs");
__asm__(".set __builtin_ffs,__tcc_builtin_ffs");
__asm__(".globl __builtin_ffsl");
__asm__(".set __builtin_ffsl,__tcc_builtin_ffsl");
__asm__(".globl __builtin_ffsll");
__asm__(".set __builtin_ffsll,__tcc_builtin_ffsll");
#else
int __builtin_ffs(int x) __attribute__((alias("__tcc_builtin_ffs")));
int __builtin_ffsl(long x) __attribute__((alias("__tcc_builtin_ffsl")));
int __builtin_ffsll(long long x) __attribute__((alias("__tcc_builtin_ffsll")));
#endif
int __builtin_clz(unsigned int x) __attribute__((alias("__tcc_builtin_clz")));
int __builtin_clzl(unsigned long x) __attribute__((alias("__tcc_builtin_clzl")));
int __builtin_clzll(unsigned long long x) __attribute__((alias("__tcc_builtin_clzll")));
int __builtin_ctz(unsigned int x) __attribute__((alias("__tcc_builtin_ctz")));
int __builtin_ctzl(unsigned long x) __attribute__((alias("__tcc_builtin_ctzl")));
int __builtin_ctzll(unsigned long long x) __attribute__((alias("__tcc_builtin_ctzll")));
int __builtin_clrsb(int x) __attribute__((alias("__tcc_builtin_clrsb")));
int __builtin_clrsbl(long x) __attribute__((alias("__tcc_builtin_clrsbl")));
int __builtin_clrsbll(long long x) __attribute__((alias("__tcc_builtin_clrsbll")));
int __builtin_popcount(unsigned int x) __attribute__((alias("__tcc_builtin_popcount")));
int __builtin_popcountl(unsigned long x) __attribute__((alias("__tcc_builtin_popcountl")));
int __builtin_popcountll(unsigned long long x) __attribute__((alias("__tcc_builtin_popcountll")));
int __builtin_parity(unsigned int x) __attribute__((alias("__tcc_builtin_parity")));
int __builtin_parityl(unsigned long x) __attribute__((alias("__tcc_builtin_parityl")));
int __builtin_parityll(unsigned long long x) __attribute__((alias("__tcc_builtin_parityll")));
#endif #endif
int __builtin_parityll (unsigned long long x) { POPCOUNTL(x, 0x01) }

19
lib/stdatomic.c
View File

@ -115,11 +115,18 @@ ATOMIC_GEN(uint32_t, 4, "l")
ATOMIC_GEN(uint64_t, 8, "q") ATOMIC_GEN(uint64_t, 8, "q")
#endif #endif
void __atomic_signal_fence (int memorder) /* uses alias to allow building with gcc/clang */
#ifdef __TINYC__
#define ATOMIC(x) __atomic_##x
#else
#define ATOMIC(x) __tcc_atomic_##x
#endif
void ATOMIC(signal_fence) (int memorder)
{ {
} }
void __atomic_thread_fence (int memorder) void ATOMIC(thread_fence) (int memorder)
{ {
#if defined __i386__ #if defined __i386__
__asm__ volatile("lock orl $0, (%esp)"); __asm__ volatile("lock orl $0, (%esp)");
@ -134,7 +141,7 @@ void __atomic_thread_fence (int memorder)
#endif #endif
} }
bool __atomic_is_lock_free(size_t size, void *ptr) bool ATOMIC(is_lock_free) (unsigned long size, const volatile void *ptr)
{ {
bool ret; bool ret;
@ -151,3 +158,9 @@ bool __atomic_is_lock_free(size_t size, void *ptr)
} }
return ret; return ret;
} }
#ifndef __TINYC__
void __atomic_signal_fence(int memorder) __attribute__((alias("__tcc_atomic_signal_fence")));
void __atomic_thread_fence(int memorder) __attribute__((alias("__tcc_atomic_thread_fence")));
bool __atomic_is_lock_free(unsigned long size, const volatile void *ptr) __attribute__((alias("__tcc_atomic_is_lock_free")));
#endif

2
lib/tcov.c
View File

@ -234,7 +234,7 @@ static void merge_test_coverage (tcov_file *file, FILE *fp,
size_t len = strlen (file->filename); size_t len = strlen (file->filename);
while (fgets(str, sizeof(str), fp) && while (fgets(str, sizeof(str), fp) &&
(p = strstr(str, "0:File:")) == NULL); (p = strstr(str, "0:File:")) == NULL) {}
if ((p = strstr(str, "0:File:")) == NULL || if ((p = strstr(str, "0:File:")) == NULL ||
strncmp (p + strlen("0:File:"), file->filename, len) != 0 || strncmp (p + strlen("0:File:"), file->filename, len) != 0 ||
p[strlen("0:File:") + len] != ' ') p[strlen("0:File:") + len] != ' ')