summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/Makefile.commonarch
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-09-17 23:41:56 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-09-17 23:41:56 +0200
commit2695bf4142b3d7154ef123dcc34d531c155af510 (patch)
treea0f7237e770533b262d22becdb14954b504c65b8 /libc/sysdeps/linux/Makefile.commonarch
parentdef0d92193606e184d356c4d2d1752526573f87c (diff)
parenta9bdc5d28e692c04f51bcea1bb8e87f9c72ad09f (diff)
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'libc/sysdeps/linux/Makefile.commonarch')
-rw-r--r--libc/sysdeps/linux/Makefile.commonarch12
1 files changed, 10 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/Makefile.commonarch b/libc/sysdeps/linux/Makefile.commonarch
index a001a44f1..1bf2dc511 100644
--- a/libc/sysdeps/linux/Makefile.commonarch
+++ b/libc/sysdeps/linux/Makefile.commonarch
@@ -20,8 +20,16 @@ libc-y += $(ARCH_OBJS-y)
libc-nomulti-y += $(ARCH_SOBJ)
objclean-y += CLEAN_$(subst $(top_builddir),,$(ARCH_OUT))
-CFLAGS-crti.S+=$(PICFLAG)
-CFLAGS-crtn.S+=$(PICFLAG)
+CFLAGS-OMIT-crt1.S := -D_LIBC_REENTRANT
+CFLAGS-OMIT-crti.S := -D_LIBC_REENTRANT
+CFLAGS-OMIT-crtn.S := -D_LIBC_REENTRANT
+CFLAGS-OMIT-crtreloc.c := -D_LIBC_REENTRANT
+CFLAGS-crti.S += $(PICFLAG)
+CFLAGS-crtn.S += $(PICFLAG)
+# Due to a "bug" in make these order_only prereqs inherit per-target flags.
+# Attempt to workaround this inconvenient behaviour:
+CFLAGS-OMIT-crt1.S += $(CFLAGS-rtld) -DIN_LIB=%
+CFLAGS-OMIT-crtreloc.c += $(CFLAGS-rtld) -DIN_LIB=%
CLEAN_$(subst $(top_builddir),,$(ARCH_OUT)):
$(do_rm) $(addprefix $(ARCH_OUT)/*., o os oS) $(CTOR_TARGETS) $(CRTS)