diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2009-10-08 16:48:16 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2009-10-08 16:48:16 +0200 |
| commit | 374e9300e8ba8e9b1a01bd35de981b32e95db3c8 (patch) | |
| tree | b55b6b2f567e16b276f7dcb5eabdf1932d4328f0 /libc/sysdeps | |
| parent | 272c8e6264e0bd7a945a493e313ce909e20e814a (diff) | |
| download | uClibc-alpine-374e9300e8ba8e9b1a01bd35de981b32e95db3c8.tar.bz2 uClibc-alpine-374e9300e8ba8e9b1a01bd35de981b32e95db3c8.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>
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 e7296d3d9..c3c55258a 100644 --- a/libc/sysdeps/linux/arm/Makefile.arch +++ b/libc/sysdeps/linux/arm/Makefile.arch @@ -20,6 +20,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 788571e3f..c2584daa4 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -73,7 +73,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) |