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 /libpthread/nptl/sysdeps/pthread | |
parent | def0d92193606e184d356c4d2d1752526573f87c (diff) | |
parent | a9bdc5d28e692c04f51bcea1bb8e87f9c72ad09f (diff) |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'libpthread/nptl/sysdeps/pthread')
-rw-r--r-- | libpthread/nptl/sysdeps/pthread/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in index add3a8e5f..84adfe0c6 100644 --- a/libpthread/nptl/sysdeps/pthread/Makefile.in +++ b/libpthread/nptl/sysdeps/pthread/Makefile.in @@ -34,7 +34,7 @@ libpthread_pthread_CSRC = \ pthread_spin_unlock.c \ pt-longjmp.c \ tpp.c -CFLAGS-pthread = $(SSP_ALL_CFLAGS) -DNOT_IN_libc -DIS_IN_libpthread + CFLAGS-pthread_barrier_wait.c = -D_GNU_SOURCE CFLAGS-pthread_spin_destroy.c = -D_GNU_SOURCE CFLAGS-pthread_spin_init.c = -D_GNU_SOURCE @@ -54,7 +54,7 @@ librt-pt-routines-y = librt-cancellation.c librt-pt-shared-only-routines-y = rt-unwind-resume.c ifeq ($(UCLIBC_CTOR_DTOR),y) -CFLAGS-OMIT-pt-initfini.c = $(CFLAGS-pthread) +CFLAGS-OMIT-pt-initfini.c = $(CFLAGS-y-libpthread/nptl/sysdeps/pthread) CFLAGS-pt-initfini.c = -S -g0 $(PICFLAG) -fno-inline-functions \ $(call check_gcc,-fno-unit-at-a-time,) \ $(SSP_DISABLE_FLAGS) \ |