diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2009-10-08 16:48:16 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-10-08 10:53:04 -0700 |
| commit | af694a224ba5aa069d533931e10725c45295148d (patch) | |
| tree | bf0ac6a848fc7077da2243d50297ba9682333e34 /libc/sysdeps | |
| parent | 072687ae9c54b55659431a5bd395d9956096ddea (diff) | |
| download | uClibc-alpine-af694a224ba5aa069d533931e10725c45295148d.tar.bz2 uClibc-alpine-af694a224ba5aa069d533931e10725c45295148d.tar.xz | |
Fix building arm EABI
The syscall() impl on aeabi comes from syscall-eabi.S thus we do not
need the generic syscall() impl.
Fixes:
AS libc/sysdeps/linux/arm/syscall-eabi.os
CC libc/sysdeps/linux/common/syscall.os
libc/libc_so.a(syscall.os): In function `syscall':
syscall.c:(.text+0x0): multiple definition of `syscall'
libc/libc_so.a(syscall-eabi.os):(.text+0x0): first defined here
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'libc/sysdeps')
| -rw-r--r-- | libc/sysdeps/linux/arm/Makefile.arch | 1 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch index a162b752b..bec06ff44 100644 --- a/libc/sysdeps/linux/arm/Makefile.arch +++ b/libc/sysdeps/linux/arm/Makefile.arch @@ -30,6 +30,7 @@ CSRC += aeabi_assert.c aeabi_atexit.c aeabi_errno_addr.c \ aeabi_localeconv.c aeabi_memclr.c aeabi_memcpy.c \ aeabi_memmove.c aeabi_memset.c find_exidx.c SSRC += syscall-eabi.S +ARCH_OBJ_FILTEROUT := syscall.c ifeq ($(UCLIBC_HAS_WCHAR),y) CSRC += aeabi_mb_cur_max.c endif diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index e2095a83c..98e259162 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -94,7 +94,7 @@ endif # fails for some reason ifneq ($(strip $(ARCH_OBJS)),) -CSRC := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC)) +CSRC := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)) $(ARCH_OBJ_FILTEROUT),$(CSRC)) endif CFLAGS-ssp.c := $(SSP_DISABLE_FLAGS) |