diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 08:59:57 +0100 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 08:59:57 +0100 |
commit | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (patch) | |
tree | 60b8d9a3ae574849fe9b3768622ec513325b1255 /hurd | |
parent | 3fcdabc977f7aa0a92da7030c775313eb6d17abc (diff) | |
parent | 64a17f1adde4715bb6607f64decd73b2df9e6852 (diff) |
Merge commit 'refs/top-bases/baseline' into baseline
Diffstat (limited to 'hurd')
-rw-r--r-- | hurd/Makefile | 2 | ||||
-rw-r--r-- | hurd/geteuids.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hurd/Makefile b/hurd/Makefile index f7c7c69d2c..4387253611 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -71,7 +71,7 @@ inlines = $(inline-headers:%.h=%-inlines) routines += hurdmalloc # Binary compatibility for libc.so.0.2[GLIBC_2.0]. -ifeq ($(versioning),yes) +ifeq ($(build-shared),yes) routines += compat-20 endif diff --git a/hurd/geteuids.c b/hurd/geteuids.c index 7c546b7e7b..92ddfae986 100644 --- a/hurd/geteuids.c +++ b/hurd/geteuids.c @@ -63,6 +63,6 @@ geteuids (int n, uid_t *uidset) /* XXX Remove this alias when we bump the libc soname. */ -#if defined SHARED && DO_VERSIONING +#ifdef SHARED weak_alias (geteuids, __getuids) #endif |