diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile | 27 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rwxr-xr-x | configure | 21 | ||||
| -rw-r--r-- | configure.ac | 16 |
5 files changed, 8 insertions, 65 deletions
diff --git a/ChangeLog b/ChangeLog index 91f83c41c7..7c0072b88e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2015-10-26 Joseph Myers <joseph@codesourcery.com> + * configure.ac (old_glibc_headers): Remove configure test. + * configure: Regenerated. + * config.make.in (old-glibc-headers): Remove variable. + * Makefile [!$(install_root) && $(old-glibc-headers) = yes] + (install): Remove dependency on remove-old-headers. + (headers2_0): Remove variable. + (remove-old-headers): Remove rule. + * configure.ac (libc_cv_dot_text): Remove configure test. (libc_cv_asm_set_directive): Use .text instead of ${libc_cv_dot_text} in configure test. diff --git a/Makefile b/Makefile index b2dd771a19..8ab0dbcb75 100644 --- a/Makefile +++ b/Makefile @@ -418,30 +418,3 @@ FORCE: iconvdata/% localedata/% po/%: FORCE $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F) - -# glibc 2.0 contains some header files which aren't used with glibc 2.1 -# anymore. -# These rules should remove those headers -ifeq (,$(install_root)) -ifeq ($(old-glibc-headers),yes) -install: remove-old-headers -endif -endif - -headers2_0 := __math.h bytesex.h confname.h direntry.h elfclass.h \ - errnos.h fcntlbits.h huge_val.h ioctl-types.h \ - ioctls.h iovec.h jmp_buf.h libc-lock.h local_lim.h \ - mathcalls.h mpool.h nan.h ndbm.h posix1_lim.h \ - posix2_lim.h posix_opt.h resourcebits.h schedbits.h \ - selectbits.h semaphorebits.h sigaction.h sigcontext.h \ - signum.h sigset.h sockaddrcom.h socketbits.h stab.def \ - statbuf.h statfsbuf.h stdio-lock.h stdio_lim.h \ - syscall-list.h termbits.h timebits.h ustatbits.h \ - utmpbits.h utsnamelen.h waitflags.h waitstatus.h \ - xopen_lim.h gnu/types.h sys/ipc_buf.h \ - sys/kernel_termios.h sys/msq_buf.h sys/sem_buf.h \ - sys/shm_buf.h sys/socketcall.h sigstack.h - -.PHONY: remove-old-headers -remove-old-headers: - rm -f $(addprefix $(inst_includedir)/, $(headers2_0)) diff --git a/config.make.in b/config.make.in index a791922738..5e4bbc8772 100644 --- a/config.make.in +++ b/config.make.in @@ -52,7 +52,6 @@ have-z-execstack = @libc_cv_z_execstack@ have-protected-data = @libc_cv_protected_data@ with-fp = @with_fp@ enable-timezone-tools = @enable_timezone_tools@ -old-glibc-headers = @old_glibc_headers@ unwind-find-fde = @libc_cv_gcc_unwind_find_fde@ have-forced-unwind = @libc_cv_forced_unwind@ have-fpie = @libc_cv_fpie@ diff --git a/configure b/configure index e375244488..22aa1b9372 100755 --- a/configure +++ b/configure @@ -607,7 +607,6 @@ libc_cv_sysconfdir libc_cv_localedir libc_cv_rtlddir libc_cv_slibdir -old_glibc_headers use_nscd libc_cv_gcc_unwind_find_fde libc_extra_cppflags @@ -6791,26 +6790,6 @@ if test "x$build_nscd" = xdefault; then build_nscd=$use_nscd fi -# Test for old glibc 2.0.x headers so that they can be removed properly -# Search only in includedir. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for old glibc 2.0.x headers" >&5 -$as_echo_n "checking for old glibc 2.0.x headers... " >&6; } -if eval test -f "${includedir}/elfclass.h" -a -f "${includedir}/fcntlbits.h" -then - old_glibc_headers=yes -else - old_glibc_headers=no -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $old_glibc_headers" >&5 -$as_echo "$old_glibc_headers" >&6; } -if test ${old_glibc_headers} = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** During \"make install\" old headers from glibc 2.0.x will" >&5 -$as_echo "$as_me: WARNING: *** During \"make install\" old headers from glibc 2.0.x will" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** be removed." >&5 -$as_echo "$as_me: WARNING: *** be removed." >&2;} -fi - - diff --git a/configure.ac b/configure.ac index 023f132ad3..6947555be4 100644 --- a/configure.ac +++ b/configure.ac @@ -1899,22 +1899,6 @@ if test "x$build_nscd" = xdefault; then build_nscd=$use_nscd fi -# Test for old glibc 2.0.x headers so that they can be removed properly -# Search only in includedir. -AC_MSG_CHECKING(for old glibc 2.0.x headers) -if eval test -f "${includedir}/elfclass.h" -a -f "${includedir}/fcntlbits.h" -then - old_glibc_headers=yes -else - old_glibc_headers=no -fi -AC_MSG_RESULT($old_glibc_headers) -if test ${old_glibc_headers} = yes; then - AC_MSG_WARN(*** During \"make install\" old headers from glibc 2.0.x will) - AC_MSG_WARN(*** be removed.) -fi -AC_SUBST(old_glibc_headers) - AC_SUBST(libc_cv_slibdir) AC_SUBST(libc_cv_rtlddir) AC_SUBST(libc_cv_localedir) |