summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ldso/ldso/powerpc/boot1_arch.h19
-rw-r--r--ldso/ldso/powerpc/dl-startup.h19
-rw-r--r--ldso/ldso/powerpc/elfinterp.c3
-rw-r--r--libc/sysdeps/linux/powerpc/bits/syscalls.h10
4 files changed, 25 insertions, 26 deletions
diff --git a/ldso/ldso/powerpc/boot1_arch.h b/ldso/ldso/powerpc/boot1_arch.h
index ae7939eb2..615db6926 100644
--- a/ldso/ldso/powerpc/boot1_arch.h
+++ b/ldso/ldso/powerpc/boot1_arch.h
@@ -5,16 +5,15 @@
/* Overrive the default _dl_boot function, and replace it with a bit of asm.
* Then call the real _dl_boot function, which is now named _dl_boot2. */
-asm("\
-.text
-.globl _dl_boot
-_dl_boot:
- mr 3,1
- addi 1,1,-16
-
- bl _dl_boot2
-.previous\n\
-");
+asm("" \
+" .text\n" \
+" .globl _dl_boot\n" \
+"_dl_boot:\n" \
+" mr 3,1\n" \
+" addi 1,1,-16\n" \
+" bl _dl_boot2\n" \
+".previous\n" \
+);
#define _dl_boot _dl_boot2
#define LD_BOOT(X) static void * __attribute__ ((unused)) _dl_boot (X)
diff --git a/ldso/ldso/powerpc/dl-startup.h b/ldso/ldso/powerpc/dl-startup.h
index ae7939eb2..615db6926 100644
--- a/ldso/ldso/powerpc/dl-startup.h
+++ b/ldso/ldso/powerpc/dl-startup.h
@@ -5,16 +5,15 @@
/* Overrive the default _dl_boot function, and replace it with a bit of asm.
* Then call the real _dl_boot function, which is now named _dl_boot2. */
-asm("\
-.text
-.globl _dl_boot
-_dl_boot:
- mr 3,1
- addi 1,1,-16
-
- bl _dl_boot2
-.previous\n\
-");
+asm("" \
+" .text\n" \
+" .globl _dl_boot\n" \
+"_dl_boot:\n" \
+" mr 3,1\n" \
+" addi 1,1,-16\n" \
+" bl _dl_boot2\n" \
+".previous\n" \
+);
#define _dl_boot _dl_boot2
#define LD_BOOT(X) static void * __attribute__ ((unused)) _dl_boot (X)
diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index 4919a2f01..6059c2615 100644
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -382,7 +382,8 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
}
break;
#else
- _dl_dprintf(2,"R_PPC_REL24: Compile shared libraries with -fPIC!\n");
+ _dl_dprintf(2, "%s: symbol '%s' is type R_PPC_REL24\n\tCompile shared libraries with -fPIC!\n",
+ _dl_progname, strtab + symtab[symtab_index].st_name);
_dl_exit(1);
#endif
case R_PPC_RELATIVE:
diff --git a/libc/sysdeps/linux/powerpc/bits/syscalls.h b/libc/sysdeps/linux/powerpc/bits/syscalls.h
index f2a1b6da4..ec9e8507f 100644
--- a/libc/sysdeps/linux/powerpc/bits/syscalls.h
+++ b/libc/sysdeps/linux/powerpc/bits/syscalls.h
@@ -24,12 +24,12 @@
__asm__ ( \
".section \".text\"\n\t" \
".align 2\n\t" \
- ".globl "###name"\n\t" \
- ".type "###name",@function\n" \
+ ".globl " STRINGIFY(name) "\n\t" \
+ ".type " STRINGIFY(name) ",@function\n" \
#name":\n\tli 0," STRINGIFY(__NR_##name) "\n\t" \
- "b "JUMPTARGET(__uClibc_syscall)"\n" \
- ".Lfe1"###name":\n\t" \
- ".size\t"###name ",.Lfe1"###name"-"###name"\n" \
+ "b " JUMPTARGET(__uClibc_syscall) "\n" \
+ ".Lfe1" STRINGIFY(name) ":\n\t" \
+ ".size\t" STRINGIFY(name) ",.Lfe1" STRINGIFY(name) "-" STRINGIFY(name) "\n" \
)
#undef _syscall0