aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2011-03-16 23:34:51 +0100
committermaximilian attems <max@stro.at>2011-04-14 16:10:35 +0200
commitc34bff09961acaac7b14b3d05abc7e4a93c496bf (patch)
tree99fdf791af2541ff7351fae81c3ec24a007e5bbf
parent58af2fea5a664c9f45da611aa9183c88cee5d5b1 (diff)
downloadklibc-c34bff09961acaac7b14b3d05abc7e4a93c496bf.tar.gz
[klibc] arm: Fix build failure with latest binutils
klibc fails to build with recent binutils as "as" became stricter: http://sourceware.org/bugzilla/show_bug.cgi?id=12519 binutils 20110225 and later would break klibc's builds as follows: TYPE unsigned int: size 4, sign 0 TYPE unsigned long: size 4, sign 0 TYPE void *: size 4, sign 0 gcc -Wp,-MD,usr/klibc/syscalls/._exit.o.d -D__ASSEMBLY__ -nostdinc -iwithprefix include -I/build/buildd/klibc-1.5.20/usr/include/arch/arm -Iusr/include/arch/arm -I/build/buildd/klibc-1.5.20/usr/include/bits32 -Iusr/include/bits32 -I/build/buildd/klibc-1.5.20/usr/klibc/../include -Iusr/klibc/../include -I/build/buildd/klibc-1.5.20/usr/include -Iusr/include -I/build/buildd/klibc-1.5.20/linux/include -Ilinux/include -I/build/buildd/klibc-1.5.20/linux/arch/arm/include -Ilinux/arch/arm/include -D__KLIBC__=1 -D__KLIBC_MINOR__=5 -D_BITSIZE=32 -fno-stack-protector -fwrapv -fno-exceptions -mabi=aapcs-linux -mno-thumb-interwork -Os -march=armv4 -mtune=strongarm -W -Wall -Wno-sign-compare -Wno-unused-parameter -D__ASSEMBLY__ -nostdinc -iwithprefix include -I/build/buildd/klibc-1.5.20/usr/include/arch/arm -Iusr/include/arch/arm -I/build/buildd/klibc-1.5.20/usr/include/bits32 -Iusr/include/bits32 -I/build/buildd/klibc-1.5.20/usr/klibc/../include -Iusr/klibc/../include -I/build/buildd/klibc-1.5.20/usr/include -Iusr/include -I/build/buildd/klibc-1.5.20/linux/include -Ilinux/include -I/build/buildd/klibc-1.5.20/linux/arch/arm/include -Ilinux/arch/arm/include -D__KLIBC__=1 -D__KLIBC_MINOR__=5 -D_BITSIZE=32 -fno-stack-protector -fwrapv -fno-exceptions -mabi=aapcs-linux -mno-thumb-interwork -Os -march=armv4 -mtune=strongarm -W -Wall -Wno-sign-compare -Wno-unused-parameter -D__ASSEMBLY__ -nostdinc -iwithprefix include -I/build/buildd/klibc-1.5.20/usr/include/arch/arm -Iusr/include/arch/arm -I/build/buildd/klibc-1.5.20/usr/include/bits32 -Iusr/include/bits32 -I/build/buildd/klibc-1.5.20/usr/klibc/../include -Iusr/klibc/../include -I/build/buildd/klibc-1.5.20/usr/include -Iusr/include -I/build/buildd/klibc-1.5.20/linux/include -Ilinux/include -I/build/buildd/klibc-1.5.20/linux/arch/arm/include -Ilinux/arch/arm/include -D__KLIBC__=1 -D__KLIBC_MINOR__=5 -D_BITSIZE=32 -fno-stack-protector -fwrapv -fno-exceptions -mabi=aapcs-linux -mno-thumb-interwork -Os -march=armv4 -mtune=strongarm -W -Wall -Wno-sign-compare -Wno-unused-parameter -c -o usr/klibc/syscalls/_exit.o usr/klibc/syscalls/_exit.S usr/klibc/syscalls/_exit.S:1:0: warning: target CPU does not support THUMB instructions usr/klibc/syscalls/_exit.S: Assembler messages: usr/klibc/syscalls/_exit.S:29: Error: .size expression does not evaluate to a constant make[5]: *** [usr/klibc/syscalls/_exit.o] Error 1 sample Ubuntu build log: http://launchpadlibrarian.net/66527153/buildlog_ubuntu-natty-armel.klibc_1.5.20-1ubuntu3_FAILEDTOBUILD.txt.gz I've fixed this in Ubuntu with the attached patch, but didn't find where to upstream it; since you're a klibc upstream developer and since it probably already affects Debian, I figured it was probably best to send it here :-) Fixes http://bugs.debian.org/618616 Reviewed-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: maximilian attems <max@stro.at>
-rw-r--r--usr/klibc/arch/arm/sysstub.ph2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/klibc/arch/arm/sysstub.ph b/usr/klibc/arch/arm/sysstub.ph
index d51ace1279b97..1a4eca05adde5 100644
--- a/usr/klibc/arch/arm/sysstub.ph
+++ b/usr/klibc/arch/arm/sysstub.ph
@@ -52,7 +52,7 @@ sub make_sysstub($$$$$@) {
print OUT "#endif /* __thumb__*/\n";
- print OUT " .size __syscall${i},.-__syscall${i}\n";
+ print OUT " .size ${fname},.-${fname}\n";
}
1;