summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2013-09-07 15:29:14 +1000
committerChris Johns <chrisj@rtems.org>2013-09-07 15:29:14 +1000
commit3baa6851dea54ae4950a3f56ce73b0a7721e9ea6 (patch)
treefcb256075bad8cb4e794fdae858ce1bda1fbf376
parent186bc96fa2bd37582f5c8296ad0bad6df01683dc (diff)
Remove warnings.
-rw-r--r--libbsd/include/sys/cdefs.h2
-rw-r--r--rap.c2
-rw-r--r--rtl-elf.c3
-rw-r--r--rtl-find-file.c2
-rw-r--r--rtl-find-file.h2
-rw-r--r--testcase/1.c2
6 files changed, 7 insertions, 6 deletions
diff --git a/libbsd/include/sys/cdefs.h b/libbsd/include/sys/cdefs.h
index a257ae4..aa99602 100644
--- a/libbsd/include/sys/cdefs.h
+++ b/libbsd/include/sys/cdefs.h
@@ -48,6 +48,7 @@
* ...delete feature...
* #endif
*/
+#if !defined(__GNUC_PREREQ__)
#ifdef __GNUC__
#define __GNUC_PREREQ__(x, y) \
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \
@@ -55,6 +56,7 @@
#else
#define __GNUC_PREREQ__(x, y) 0
#endif
+#endif
#include <machine/cdefs.h>
#ifdef __ELF__
diff --git a/rap.c b/rap.c
index 37a8702..e950505 100644
--- a/rap.c
+++ b/rap.c
@@ -298,7 +298,7 @@ rtems_rap_load (const char* name, int mode, int argc, const char* argv[])
rtems_rap_app_t* app;
rtems_rap_entry_t init;
rtems_rap_entry_t fini;
- uint32_t size = 0;
+ size_t size = 0;
int r;
/*
diff --git a/rtl-elf.c b/rtl-elf.c
index 14e2460..a02466c 100644
--- a/rtl-elf.c
+++ b/rtl-elf.c
@@ -698,7 +698,6 @@ bool rtems_rtl_elf_load_details (rtems_rtl_obj_t* obj)
{
rtems_chain_control* sections = NULL;
rtems_chain_node* node = NULL;
- bool first = true;
size_t mask = 0;
struct link_map* l = NULL;
int sec_num = 0;
@@ -755,8 +754,6 @@ bool rtems_rtl_elf_load_details (rtems_rtl_obj_t* obj)
mask <= RTEMS_RTL_OBJ_SECT_BSS;
mask <<= 1)
{
- first = true;
-
sections = &obj->sections;
node = rtems_chain_first (sections);
while (!rtems_chain_is_tail (sections, node))
diff --git a/rtl-find-file.c b/rtl-find-file.c
index 15d749e..ae56cf2 100644
--- a/rtl-find-file.c
+++ b/rtl-find-file.c
@@ -40,7 +40,7 @@ bool
rtems_rtl_find_file (const char* name,
const char* paths,
const char** file_name,
- uint32_t* size)
+ size_t* size)
{
struct stat sb;
diff --git a/rtl-find-file.h b/rtl-find-file.h
index 0daa7bf..fc8a9dc 100644
--- a/rtl-find-file.h
+++ b/rtl-find-file.h
@@ -36,7 +36,7 @@ extern "C" {
bool rtems_rtl_find_file (const char* name,
const char* paths,
const char** file_name,
- uint32_t* size);
+ size_t* size);
#ifdef __cplusplus
}
diff --git a/testcase/1.c b/testcase/1.c
index 83c16b5..14b3729 100644
--- a/testcase/1.c
+++ b/testcase/1.c
@@ -62,6 +62,7 @@ void hello(int arg)
}
#if defined (__arm__)
+int rtems_arm(int arg);
int rtems_arm(int arg)
{
switch (arg) {
@@ -72,6 +73,7 @@ int rtems_arm(int arg)
return 0;
}
+int rtems_thumb(int arg);
int rtems_thumb(int arg)
{
switch (arg) {