diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-20 12:11:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:11:46 -0400 |
| commit | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (patch) | |
| tree | ec2e9ec5f3e4a6d8523e80ab58e6c9c296fbc05c /src/multiboot.c | |
| parent | 3f762629e830c0cad66c4efeea5b918bdf4cce20 (diff) | |
| parent | 6edacdee36d31b2df69559f28a33b8d9e958bf5e (diff) | |
Merge pull request #732 from PikalaxALT/modern_gcc
Modernize code for compatibility with later releases of GCC
Diffstat (limited to 'src/multiboot.c')
| -rw-r--r-- | src/multiboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multiboot.c b/src/multiboot.c index da90a55c0..c7e14392e 100644 --- a/src/multiboot.c +++ b/src/multiboot.c @@ -1,7 +1,7 @@ #include "gba/gba.h" #include "multiboot.h" -IWRAM_DATA static u16 MultiBoot_required_data[MULTIBOOT_NCHILD]; +static u16 MultiBoot_required_data[MULTIBOOT_NCHILD]; static int MultiBootSend(struct MultiBootParam *mp, u16 data); static int MultiBootHandShake(struct MultiBootParam *mp); @@ -435,7 +435,7 @@ static int MultiBootHandShake(struct MultiBootParam *mp) #undef must_data } -static void MultiBootWaitCycles(u32 cycles) +static NOINLINE void MultiBootWaitCycles(u32 cycles) { asm("mov r2, pc"); asm("lsr r2, #24"); |