mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 10:07:38 -04:00
Don't force gcc as host compiler + fix clang warnings
On MacOS, gcc is a symlink for clang. Patch gets rid of the warnings produced by clang, when it is set as HOSTCC, and fixes voicetools compilation on MacOS when calling make voicetools from the simulator directory. lua rb_defines_helper: format specifies type 'int' but the argument has type 'long' codecs: opus / speex (LOGF): format '%ld' expects argument of type 'long int', but argument 7 has type 'off_t' gigabeat: variable 'size' set but not used rdf2binary: a function declaration without a prototype is deprecated in all versions of C rbspeexdec: passing 'unsigned char *' to parameter of type 'char *' converts between pointers to integer types where one is of the unique plain 'char' type and the other is not hmac-sha1.c defining a type within 'offsetof' is a Clang extension Change-Id: I90539906698868f9589650585d865aee9f7e8539
This commit is contained in:
parent
a86b1999d0
commit
727c800c0d
8 changed files with 25 additions and 33 deletions
|
@ -161,7 +161,7 @@ foreach my $define (@sorted_defines)
|
|||
}
|
||||
elsif(@$define{'value'} =~ /^[0-9]+$/) #number
|
||||
{
|
||||
printf "\tprintf(\"%s[\\\"%%s\\\"] = %%d\\n\", stringify(%s), %s);\n", $lua_table, @$define{'name'}, @$define{'name'};
|
||||
printf "\tprintf(\"%s[\\\"%%s\\\"] = %%ld\\n\", stringify(%s), (long) %s);\n", $lua_table, @$define{'name'}, @$define{'name'};
|
||||
}
|
||||
else #might be a string but we don't know since the macro isn't expanded far enough
|
||||
{
|
||||
|
@ -199,7 +199,7 @@ foreach my $define (@sorted_defines)
|
|||
}
|
||||
elsif ($var =~$num_regex) #it must be a number
|
||||
{
|
||||
printf "\tprintf(\"%s[\\\"%%s\\\"] = %%d\\n\", stringify(%s), %s);\n", $lua_table, @$define{'name'}, @$define{'name'};
|
||||
printf "\tprintf(\"%s[\\\"%%s\\\"] = %%ld\\n\", stringify(%s), (long) %s);\n", $lua_table, @$define{'name'}, @$define{'name'};
|
||||
}
|
||||
else { warn "Skipping ".@$define{'name'}." indeterminate macro type\n"; }
|
||||
}
|
||||
|
|
|
@ -70,7 +70,7 @@ static int seek_ogg_page(uint64_t filepos)
|
|||
break;
|
||||
if (memcmp(buf, synccode, sizeof(buf)) == 0) {
|
||||
ci->seek_buffer(ci->curpos - sizeof(buf));
|
||||
LOGF("next page %ld", ci->curpos);
|
||||
LOGF("next page %jd", (intmax_t) ci->curpos);
|
||||
return 1;
|
||||
} else
|
||||
ci->seek_buffer(ci->curpos - (sizeof(buf) - 1));
|
||||
|
@ -91,7 +91,7 @@ static int seek_opus_tags(void)
|
|||
break;
|
||||
if (memcmp(buf, synccode, sizeof(buf)) == 0) {
|
||||
ci->seek_buffer(ci->curpos - sizeof(buf));
|
||||
LOGF("OpusTags %ld", ci->curpos);
|
||||
LOGF("OpusTags %jd", (intmax_t) ci->curpos);
|
||||
return 1;
|
||||
} else
|
||||
ci->seek_buffer(ci->curpos - (sizeof(buf) - 1));
|
||||
|
|
|
@ -222,9 +222,9 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos,
|
|||
offset = get_next_page(oy,&og,-1);
|
||||
|
||||
if (offset < 0) { /* could not find new page,use old offset */
|
||||
LOGF("Seek/guess/fault:%lld->-<-%d,%lld:%lld,%d,%ld,%d\n",
|
||||
LOGF("Seek/guess/fault:%lld->-<-%d,%lld:%lld,%d,%jd,%d\n",
|
||||
(long long int)curpos,0, (long long int)pos,
|
||||
(long long int)offset,0,ci->curpos,/*stream_length*/0);
|
||||
(long long int)offset,0, (intmax_t) ci->curpos,/*stream_length*/0);
|
||||
|
||||
curoffset = *curbyteoffset;
|
||||
|
||||
|
@ -233,9 +233,9 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos,
|
|||
spx_ogg_sync_reset(oy);
|
||||
} else {
|
||||
if (spx_ogg_page_granulepos(&og) == 0 && pos > 5000) {
|
||||
LOGF("SEEK/guess/fault:%lld->-<-%lld,%lld:%lld,%d,%ld,%d\n",
|
||||
LOGF("SEEK/guess/fault:%lld->-<-%lld,%lld:%lld,%d,%jd,%d\n",
|
||||
(long long int)curpos,(long long int)spx_ogg_page_granulepos(&og),
|
||||
(long long int)pos, (long long int)offset,0,ci->curpos,/*stream_length*/0);
|
||||
(long long int)pos, (long long int)offset,0, (intmax_t) ci->curpos,/*stream_length*/0);
|
||||
|
||||
curoffset = *curbyteoffset;
|
||||
|
||||
|
|
9
tools/configure
vendored
9
tools/configure
vendored
|
@ -16,9 +16,6 @@ LDOPTS=""
|
|||
GLOBAL_LDOPTS=""
|
||||
LDMAP_OPT="-Map"
|
||||
|
||||
HOSTCC=gcc
|
||||
HOSTAR=ar
|
||||
|
||||
extradefines=""
|
||||
use_logf="#undef ROCKBOX_HAS_LOGF"
|
||||
use_bootchart="#undef DO_BOOTCHART"
|
||||
|
@ -398,9 +395,7 @@ simcc () {
|
|||
if $CC --version | grep -q "clang"; then
|
||||
echo "[Warning] Clang compiler ($CC) in your path is unsupported. Trying gcc-14."
|
||||
CC=gcc-14
|
||||
HOSTCC=gcc-14
|
||||
AR=gcc-ar-14
|
||||
HOSTAR=gcc-ar-14
|
||||
CPP=cpp-14
|
||||
fi
|
||||
LDOPTS="$LDOPTS -ldl"
|
||||
|
@ -4612,8 +4607,8 @@ else
|
|||
fi
|
||||
|
||||
# figure out the full path to the various commands if possible
|
||||
HOSTCC=`findtool ${HOSTCC} --lit`
|
||||
HOSTAR=`findtool ${HOSTAR} --lit`
|
||||
HOSTCC=`findtool gcc --lit`
|
||||
HOSTAR=`findtool ar --lit`
|
||||
CC=`findtool ${CC} --lit`
|
||||
CPP=`findtool ${CPP} --lit`
|
||||
LD=`findtool ${LD} --lit`
|
||||
|
|
|
@ -52,7 +52,6 @@ static FILE * openoutfile( const char * filename )
|
|||
int gigabeat_code(char *infile, char *outfile)
|
||||
{
|
||||
FILE *in, *out;
|
||||
unsigned long size = 0;
|
||||
unsigned long bytes_read;
|
||||
unsigned char buf[4];
|
||||
unsigned long data;
|
||||
|
@ -72,8 +71,6 @@ int gigabeat_code(char *infile, char *outfile)
|
|||
key = key + (key << 1);
|
||||
key = key + 0x19751217;
|
||||
|
||||
size += bytes_read;
|
||||
|
||||
/* Write out little-endian */
|
||||
int2le(data, buf);
|
||||
|
||||
|
|
|
@ -225,7 +225,7 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
|
|||
if (len >= 64)
|
||||
{
|
||||
#if !_STRING_ARCH_unaligned
|
||||
# define alignof(type) offsetof (struct { char c; type x; }, x)
|
||||
# define alignof(type) __alignof__(type)
|
||||
# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
|
||||
if (UNALIGNED_P (buffer))
|
||||
while (len > 64)
|
||||
|
|
|
@ -74,8 +74,8 @@ int main(int argc, char **argv)
|
|||
fclose(fin);
|
||||
|
||||
/* fill in wav header */
|
||||
strcpy(wavhdr, "RIFF");
|
||||
strcpy(wavhdr + 8, "WAVEfmt ");
|
||||
strcpy((char *) wavhdr, "RIFF");
|
||||
strcpy((char *) wavhdr + 8, "WAVEfmt ");
|
||||
put_uint_le(16, wavhdr + 16);
|
||||
put_ushort_le(1, wavhdr + 20); /* PCM data */
|
||||
put_ushort_le(1, wavhdr + 22); /* mono */
|
||||
|
@ -83,7 +83,7 @@ int main(int argc, char **argv)
|
|||
put_uint_le(16000*2, wavhdr + 28); /* chan*sr*bbs/8 */
|
||||
put_ushort_le(2, wavhdr + 32); /* chan*bps/8 */
|
||||
put_ushort_le(16, wavhdr + 34); /* bits per sample */
|
||||
strcpy(wavhdr + 36, "data");
|
||||
strcpy((char *) wavhdr + 36, "data");
|
||||
fwrite(wavhdr, 1, 44, fout); /* write header */
|
||||
/* make bit buffer use our own buffer */
|
||||
speex_bits_set_bit_buffer(&bits, indata, insize);
|
||||
|
|
|
@ -58,7 +58,7 @@ long reverse (long N) {
|
|||
}
|
||||
|
||||
|
||||
int main()
|
||||
int main(void)
|
||||
{
|
||||
FILE *in, *idx_out, *desc_out;
|
||||
struct word w;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue