gwj / at91sam9263 · Commits

Commit 7ee930d03130e69282503949202b9e6812e8c1bd

Authored by blueswir1
1 parent 5628a626

Fix warnings that would be caused by ld flag --warn-common 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5240 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 4 changed files with 6 additions and 2 deletions
@@ -54,6 +54,8 @@ static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num, @@ -54,6 +54,8 @@ static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num,
54 static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, 54 static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
55 const uint8_t *buf, int nb_sectors); 55 const uint8_t *buf, int nb_sectors);
56 56
  57 +BlockDriverState *bdrv_first;
  58 +
57 static BlockDriver *first_drv; 59 static BlockDriver *first_drv;
58 60
59 int path_is_absolute(const char *path) 61 int path_is_absolute(const char *path)
block_int.h
  View file @7ee930d
@@ -145,6 +145,6 @@ void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb, @@ -145,6 +145,6 @@ void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,
145 void *opaque); 145 void *opaque);
146 void qemu_aio_release(void *p); 146 void qemu_aio_release(void *p);
147 147
148 -BlockDriverState *bdrv_first; 148 +extern BlockDriverState *bdrv_first;
149 149
150 #endif /* BLOCK_INT_H */ 150 #endif /* BLOCK_INT_H */
hw/arm-misc.h
  View file @7ee930d
@@ -37,7 +37,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info); @@ -37,7 +37,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info);
37 37
38 /* Multiplication factor to convert from system clock ticks to qemu timer 38 /* Multiplication factor to convert from system clock ticks to qemu timer
39 ticks. */ 39 ticks. */
40 -int system_clock_scale; 40 +extern int system_clock_scale;
41 qemu_irq *armv7m_nvic_init(CPUState *env); 41 qemu_irq *armv7m_nvic_init(CPUState *env);
42 42
43 /* stellaris_enent.c */ 43 /* stellaris_enent.c */
hw/armv7m_nvic.c
  View file @7ee930d
@@ -50,6 +50,8 @@ typedef struct { @@ -50,6 +50,8 @@ typedef struct {
50 #define SYSTICK_CLKSOURCE (1 << 2) 50 #define SYSTICK_CLKSOURCE (1 << 2)
51 #define SYSTICK_COUNTFLAG (1 << 16) 51 #define SYSTICK_COUNTFLAG (1 << 16)
52 52
  53 +int system_clock_scale;
  54 +
53 /* Conversion factor from qemu timer to SysTick frequencies. */ 55 /* Conversion factor from qemu timer to SysTick frequencies. */
54 static inline int64_t systick_scale(nvic_state *s) 56 static inline int64_t systick_scale(nvic_state *s)
55 { 57 {