commit 38972938256688f9a48c985d58e0ab9007e8664e
author Juan Quintela <quintela@redhat.com> Wed Sep 23 01:19:02 2009 +0200
committer Blue Swirl <blauwirbel@gmail.com> Fri Sep 25 19:52:06 2009 +0000
tree 291a33fe391fc48a232490b3080690aeebe82a3d
parent 668a38fcbd5b25167b2153b592d996aeced5a762

gcc wants 1st static and then const

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

hw/g364fb.c

diff --git a/hw/g364fb.c b/hw/g364fb.c
index 88e3048..d1d2c12 100644
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -396,7 +396,7 @@
 
 static void g364fb_update_depth(G364State *s)
 {
-    const static int depths[8] = { 1, 2, 4, 8, 15, 16, 0 };
+    static const int depths[8] = { 1, 2, 4, 8, 15, 16, 0 };
     s->depth = depths[(s->ctla & 0x00700000) >> 20];
 }
 

target-i386/kvm.c

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index cab9fcc..7010999 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -790,7 +790,7 @@
 #ifdef KVM_CAP_SET_GUEST_DEBUG
 int kvm_arch_insert_sw_breakpoint(CPUState *env, struct kvm_sw_breakpoint *bp)
 {
-    const static uint8_t int3 = 0xcc;
+    static const uint8_t int3 = 0xcc;
 
     if (cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&bp->saved_insn, 1, 0) ||
         cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&int3, 1, 1))

target-microblaze/translate.c

diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index dfeb8ae..e91ea39 100644
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -91,7 +91,7 @@
     int singlestep_enabled;
 } DisasContext;
 
-const static char *regnames[] =
+static const char *regnames[] =
 {
     "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
     "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
@@ -99,7 +99,7 @@
     "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31",
 };
 
-const static char *special_regnames[] =
+static const char *special_regnames[] =
 {
     "rpc", "rmsr", "sr2", "sr3", "sr4", "sr5", "sr6", "sr7",
     "sr8", "sr9", "sr10", "sr11", "sr12", "sr13", "sr14", "sr15",