diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-12-29 15:01:46 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-12-29 15:01:46 +0100 |
| commit | 218db6679aea0dcf05fb60566cef6e18f706d9ba (patch) | |
| tree | 3099f55335743748ff18bd435e4de25b22c8f54a /Makefile | |
| parent | 0a69b89843ec466fa20c994a29d13de6a45c3acb (diff) | |
| parent | 7d4a84731cd80a1ef711c83535c6340f0e2b143f (diff) | |
Merge branch 'master' into 2.262.26
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -87,12 +87,14 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-mutexattr-getpshared pt-mutexattr-gettype \ pt-mutexattr-setprioceiling pt-mutexattr-setprotocol \ pt-mutexattr-setpshared pt-mutexattr-settype \ + pt-mutexattr-getrobust pt-mutexattr-setrobust \ \ pt-mutex-init pt-mutex-destroy \ pt-mutex-lock pt-mutex-trylock pt-mutex-timedlock \ pt-mutex-unlock \ pt-mutex-transfer-np \ pt-mutex-getprioceiling pt-mutex-setprioceiling \ + pt-mutex-consistent \ \ pt-rwlock-attr \ pt-rwlockattr-init pt-rwlockattr-destroy \ @@ -175,6 +177,8 @@ headers := \ bits/pthread.h \ bits/pthread-np.h \ bits/pthreadtypes.h \ + bits/pthreadtypes-arch.h \ + bits/thread-shared-types.h \ bits/mutex.h \ bits/condition.h \ bits/condition-attr.h \ @@ -220,12 +224,6 @@ SYSDEP_PATH = $(srcdir)/sysdeps/$(MICROKERNEL)/hurd/i386 \ VPATH += $(SYSDEP_PATH) ifeq ($(IN_GLIBC),no) -HURDLIBS = ihash -else -LDLIBS-pthread.so = -lihash -endif - -ifeq ($(IN_GLIBC),no) installhdrs := installhdrsubdir := . |