Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change the gcc options for sdl builds to allow for gnu99 features, it needs some fixes in other places. Fixes test_mem compilation failure on cygwin.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28723 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-12-02 21:20:30 +00:00
parent 589d2110dc
commit 921ac8d6dd
7 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/doom/z_zone.c
View file

@ -248,7 +248,7 @@ void Z_Init(void)
zonebase_size=size;
printf("Z_Init: Allocated %dKb zone memory\n", (long unsigned)size >> 10);
printf("Z_Init: Allocated %uldKb zone memory\n", (long unsigned)(size >> 10));
// Align on cache boundary

2
apps/plugins/mp3_encoder.c
View file

@ -903,7 +903,7 @@ int read_samples(uint32_t *buffer, int num_samples)
return samples;
}
inline uint32_t myswap32(uint32_t val)
static inline uint32_t myswap32(uint32_t val)
{
const uint8_t* v = (const uint8_t*)&val;

2
apps/plugins/test_disk.c
View file

@ -434,7 +434,7 @@ enum plugin_status plugin_start(const void* parameter)
audiobuf = rb->plugin_get_audio_buffer(&audiobuflen);
/* align start and length to 32 bit */
align = (-(int)audiobuf) & 3;
align = (-(intptr_t)audiobuf) & 3;
audiobuf += align;
audiobuflen = (audiobuflen - align) & ~3;

4
apps/plugins/test_mem.c
View file

@ -188,7 +188,9 @@ enum plugin_status plugin_start(const void* parameter)
{
(void)parameter;
bool done = false;
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
bool boost = false;
#endif
int count = 0;
#ifdef HAVE_LCD_BITMAP
@ -204,7 +206,7 @@ enum plugin_status plugin_start(const void* parameter)
line = 0;
int ret;
rb->screens[0]->clear_display();
#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
TEST_MEM_PRINTF("%s", boost?"boosted":"unboosted");
TEST_MEM_PRINTF("clock: %d Hz", *rb->cpu_frequency);
#endif

17
firmware/libc/sscanf.c
View file

@ -1,22 +1,7 @@
#include <stdarg.h>
#include <string.h>
#include <stdbool.h>
static inline bool isspace(char c)
{
return (c == ' ') || (c == '\t') || (c == '\n');
}
static inline bool isdigit(char c)
{
return (c >= '0') && (c <= '9');
}
static inline bool isxdigit(char c)
{
return ((c >= '0') && (c <= '9'))
|| ((c >= 'a') && (c <= 'f')) || ((c >= 'A') && (c <= 'F'));
}
#include <ctype.h>
static int parse_dec(int (*peek)(void *userp),
void (*pop)(void *userp),

4
firmware/target/hosted/sdl/thread-sdl.c
View file

@ -632,8 +632,8 @@ void thread_exit(void)
remove_thread(THREAD_ID_CURRENT);
/* This should never and must never be reached - if it is, the
* state is corrupted */
THREAD_PANICF("thread_exit->K:*R",
thread_id_entry(THREAD_ID_CURRENT));
THREAD_PANICF("thread_exit->K:*R (ID: %d)",
thread_id_entry(THREAD_ID_CURRENT)->id);
while (1);
}

3
tools/configure vendored
View file

@ -202,7 +202,8 @@ simcc () {
app_type=$1
winbuild=""
GCCOPTS='-W -Wall -g -fno-builtin'
GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef// -e s/-O//`
GCCOPTS="$GCCOPTS -fno-builtin -g"
GCCOPTIMIZE=''
LDOPTS='-lm' # button-sdl.c uses sqrt()