diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-08-27 17:45:19 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-08-27 19:23:20 +0200 |
| commit | 8ae2b54ee70891ddb720bf00f8913c3716c1f67f (patch) | |
| tree | 2f7acae8c517733957f27c87dec8827fb5ca37b5 /libc | |
| parent | f9d8ce5ae0ed1e1a639ddc9b2b64726eab569c66 (diff) | |
remove DOMULTI support
A single test with targeting ARM showed that this feature
seems bit rotted. Remove DOMULTI and simplify Makefiles.
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Makefile.in | 14 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/bits/syscalls.h | 12 |
2 files changed, 0 insertions, 26 deletions
diff --git a/libc/Makefile.in b/libc/Makefile.in index 8ed8a751a..05cec1875 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -42,14 +42,7 @@ else libc-a-y = $(libc-y) $(libc-static-y) endif -ifeq ($(DOMULTI),n) libc-so-y = $(libc-y:.o=.os) $(libc-shared-y) -else -all_sources = $(libc-y:.o=.c) -all_sources += $(libc-shared-y:.oS=.c) -libc-multi-y = $(filter-out $(libc-nomulti-y:.o=.c),$(all_sources)) -endif - lib-a-y += $(top_builddir)lib/libc.a lib-gdb-y += $(top_builddir)lib/libc.gdb lib-so-y += $(libc.depend) @@ -57,17 +50,10 @@ objclean-y += CLEAN_libc OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | $(SED) -n '/OUTPUT_FORMAT/,/)/p' -ifeq ($(DOMULTI),n) $(libc.depend): $(libc_OUT)/libc_so.a $(LIBS-libc.so) $(call link.so,$(libc_FULL_NAME),$(ABI_VERSION)) # link for backward compatibility $(call link.so,$(libc_FULL_NAME),0) -else -$(libc.depend): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so) - $(call linkm.so,$(libc_FULL_NAME),$(ABI_VERSION)) - # link for backward compatibility - $(call linkm.so,$(libc_FULL_NAME),0) -endif $(Q)$(RM) $@ $(Q)cat $(top_srcdir)extra/scripts/format.lds > $@.tmp $(Q)$(OUTPUT_FORMAT) >> $@.tmp diff --git a/libc/sysdeps/linux/i386/bits/syscalls.h b/libc/sysdeps/linux/i386/bits/syscalls.h index 566b5acf5..5e9209386 100644 --- a/libc/sysdeps/linux/i386/bits/syscalls.h +++ b/libc/sysdeps/linux/i386/bits/syscalls.h @@ -44,17 +44,9 @@ /* We need some help from the assembler to generate optimal code. * We define some macros here which later will be used. */ -/* gcc>=4.6 with LTO need the same guards as IMA (a.k.a --combine) did. - * See gcc.gnu.org/PR47577 */ /* FIXME: drop these b* macros! */ __asm__ ( -#if defined __DOMULTI__ || __GNUC_PREREQ (4, 6) - /* Protect against asm macro redefinition (happens in __DOMULTI__ mode). - * Unfortunately, it ends up visible in .o files. */ - ".ifndef _BITS_SYSCALLS_ASM\n\t" - ".set _BITS_SYSCALLS_ASM,1\n\t" -#endif ".L__X'%ebx = 1\n\t" ".L__X'%ecx = 2\n\t" ".L__X'%edx = 2\n\t" @@ -95,10 +87,6 @@ __asm__ ( ".endif\n\t" ".endif\n\t" ".endm\n\t" - -#if defined __DOMULTI__ || __GNUC_PREREQ (4, 6) - ".endif\n\t" /* _BITS_SYSCALLS_ASM */ -#endif ); #define LOADARGS_0 |