diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-17 23:41:56 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-17 23:41:56 +0200 |
| commit | 2695bf4142b3d7154ef123dcc34d531c155af510 (patch) | |
| tree | a0f7237e770533b262d22becdb14954b504c65b8 /Rules.mak | |
| parent | def0d92193606e184d356c4d2d1752526573f87c (diff) | |
| parent | a9bdc5d28e692c04f51bcea1bb8e87f9c72ad09f (diff) | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'Rules.mak')
| -rw-r--r-- | Rules.mak | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -633,7 +633,7 @@ WARNING_FLAGS += \ -Wshadow \ -Wundef # Works only w/ gcc-3.4 and up, can't be checked for gcc-3.x w/ check_gcc() -WARNING_FLAGS-gcc-4 += -Wdeclaration-after-statement +#WARNING_FLAGS-gcc-4 += -Wdeclaration-after-statement endif WARNING_FLAGS += $(WARNING_FLAGS-gcc-$(GCC_MAJOR_VER)) $(foreach w,$(WARNING_FLAGS),$(eval $(call check-gcc-var,$(w)))) @@ -737,10 +737,14 @@ ifneq ($(strip $(UCLIBC_EXTRA_LDFLAGS)),"") LDFLAGS += $(call qstrip,$(UCLIBC_EXTRA_LDFLAGS)) endif +ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) +CFLAGS += -D__USE_STDIO_FUTEXES__ +endif + ifeq ($(UCLIBC_HAS_THREADS),y) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) PTNAME := nptl - CFLAGS += -DHAVE_FORCED_UNWIND + CFLAGS += -DHAVE_FORCED_UNWIND -D_LIBC_REENTRANT else ifeq ($(LINUXTHREADS_OLD),y) PTNAME := linuxthreads.old @@ -814,7 +818,7 @@ endif ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y) $(eval $(call check-as-var,--noexecstack)) endif -ASFLAGS = $(ASFLAG_--noexecstack) +ASFLAGS += $(ASFLAG_--noexecstack) LIBGCC_CFLAGS ?= $(CFLAGS) $(CPU_CFLAGS-y) $(eval $(call cache-output-var,LIBGCC,$(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)) |