From 579db35a068e70a4f3112000778138ede6994ac0 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Fri, 11 Apr 2014 13:11:50 +0200 Subject: [PATCH] S/390: Unify 31 and 64 bit configure.ac --- ChangeLog | 9 +++++++++ sysdeps/s390/{s390-32 => }/configure | 1 - sysdeps/s390/{s390-32 => }/configure.ac | 0 sysdeps/s390/s390-64/configure | 5 ----- sysdeps/s390/s390-64/configure.ac | 6 ------ 5 files changed, 9 insertions(+), 12 deletions(-) rename sysdeps/s390/{s390-32 => }/configure (99%) rename sysdeps/s390/{s390-32 => }/configure.ac (100%) delete mode 100644 sysdeps/s390/s390-64/configure delete mode 100644 sysdeps/s390/s390-64/configure.ac diff --git a/ChangeLog b/ChangeLog index 7bef273b40..5708d4eb64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-04-11 Stefan Liebler + + * sysdeps/s390/s390-32/configure.ac: Unify file with ... + * sysdeps/s390/s390-64/configure.ac: ... this ... + * sysdeps/s390/configure.ac: ... to here. + * sysdeps/s390/s390-32/configure: Delete file. + * sysdeps/s390/s390-64/configure: Delete file. + * sysdeps/s390/configure: Regenerate. + 2014-04-11 Joseph Anthony Pasquale Holsten * resolv/res_query.c (__libc_res_nsearch): Fix typo in comment. diff --git a/sysdeps/s390/s390-32/configure b/sysdeps/s390/configure similarity index 99% rename from sysdeps/s390/s390-32/configure rename to sysdeps/s390/configure index 024565f85a..0550c455ea 100644 --- a/sysdeps/s390/s390-32/configure +++ b/sysdeps/s390/configure @@ -2,4 +2,3 @@ # Local configure fragment for sysdeps/s390. $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h - diff --git a/sysdeps/s390/s390-32/configure.ac b/sysdeps/s390/configure.ac similarity index 100% rename from sysdeps/s390/s390-32/configure.ac rename to sysdeps/s390/configure.ac diff --git a/sysdeps/s390/s390-64/configure b/sysdeps/s390/s390-64/configure deleted file mode 100644 index 024565f85a..0000000000 --- a/sysdeps/s390/s390-64/configure +++ /dev/null @@ -1,5 +0,0 @@ -# This file is generated from configure.ac by Autoconf. DO NOT EDIT! - # Local configure fragment for sysdeps/s390. - -$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h - diff --git a/sysdeps/s390/s390-64/configure.ac b/sysdeps/s390/s390-64/configure.ac deleted file mode 100644 index b5af4e12fc..0000000000 --- a/sysdeps/s390/s390-64/configure.ac +++ /dev/null @@ -1,6 +0,0 @@ -GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. -# Local configure fragment for sysdeps/s390. - -dnl It is always possible to access static and hidden symbols in an -dnl position independent way. -AC_DEFINE(PI_STATIC_AND_HIDDEN) -- 2.11.4.GIT