From db0fbac046813774566dfc025932d4e8c0a35640 Mon Sep 17 00:00:00 2001 From: joseph Date: Thu, 25 Oct 2012 20:09:53 +0000 Subject: * aclocal.m4, configure.in, crypt/sha512c-test.c, string/Makefile, sysdeps/unix/sysv/linux/i386/sysdep.h, timezone/Makefile: Revert unnecessary differences from glibc. * configure: Regenerated. git-svn-id: svn://svn.eglibc.org/trunk@21355 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/ChangeLog.eglibc | 7 +++++++ libc/aclocal.m4 | 2 -- libc/configure | 8 +------- libc/configure.in | 5 ----- libc/crypt/sha512c-test.c | 1 - libc/string/Makefile | 1 - libc/sysdeps/unix/sysv/linux/i386/sysdep.h | 4 ---- libc/timezone/Makefile | 22 +--------------------- 8 files changed, 9 insertions(+), 41 deletions(-) (limited to 'libc') diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index c12191672..ba3bd5fc0 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,10 @@ +2012-10-25 Joseph Myers + + * aclocal.m4, configure.in, crypt/sha512c-test.c, string/Makefile, + sysdeps/unix/sysv/linux/i386/sysdep.h, timezone/Makefile: Revert + unnecessary differences from glibc. + * configure: Regenerated. + 2012-10-10 Joseph Myers * elf/Makefile ($(objpfx)tst-rtld-load-self.out): Pass diff --git a/libc/aclocal.m4 b/libc/aclocal.m4 index 7ecdd6ba6..8aec4e7c4 100644 --- a/libc/aclocal.m4 +++ b/libc/aclocal.m4 @@ -106,8 +106,6 @@ AS=`$CC -print-prog-name=as` LD=`$CC -print-prog-name=ld` AR=`$CC -print-prog-name=ar` AC_SUBST(AR) -NM=`$CC -print-prog-name=nm` -AC_SUBST(NM) OBJDUMP=`$CC -print-prog-name=objdump` AC_SUBST(OBJDUMP) OBJCOPY=`$CC -print-prog-name=objcopy` diff --git a/libc/configure b/libc/configure index f468b1239..546624448 100755 --- a/libc/configure +++ b/libc/configure @@ -630,6 +630,7 @@ libc_cv_gcc_static_libgcc CXX_SYSINCLUDES SYSINCLUDES AUTOCONF +NM AWK SED MAKEINFO @@ -640,7 +641,6 @@ AS MIG OBJCOPY OBJDUMP -NM AR LN_S INSTALL_DATA @@ -4703,8 +4703,6 @@ AS=`$CC -print-prog-name=as` LD=`$CC -print-prog-name=ld` AR=`$CC -print-prog-name=ar` -NM=`$CC -print-prog-name=nm` - OBJDUMP=`$CC -print-prog-name=objdump` OBJCOPY=`$CC -print-prog-name=objcopy` @@ -5600,10 +5598,6 @@ else fi -if test "x$AWK" != "xgawk"; then - as_fn_error $? "GLIBC requires GNU awk." "$LINENO" 5 -fi - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/libc/configure.in b/libc/configure.in index 95f562a0e..a32564f0f 100644 --- a/libc/configure.in +++ b/libc/configure.in @@ -1082,11 +1082,6 @@ else fi AC_SUBST(libc_cv_have_ksh) -dnl We need gawk for at least gen-sorted.awk and option-groups.awk. -if test "x$AWK" != "xgawk"; then - AC_MSG_ERROR([GLIBC requires GNU awk.]) -fi - AC_PATH_PROG(PERL, perl, no) if test "$PERL" != no && (eval `$PERL -V:apiversion`; test `expr "$apiversion" \< 5` -ne 0); then diff --git a/libc/crypt/sha512c-test.c b/libc/crypt/sha512c-test.c index 75afc67e6..060e935c3 100644 --- a/libc/crypt/sha512c-test.c +++ b/libc/crypt/sha512c-test.c @@ -60,5 +60,4 @@ do_test (void) #define TIMEOUT 32 #define TEST_FUNCTION do_test () -#define TIMEOUT 4 #include "../test-skeleton.c" diff --git a/libc/string/Makefile b/libc/string/Makefile index ed059dcab..dc42d8f65 100644 --- a/libc/string/Makefile +++ b/libc/string/Makefile @@ -69,7 +69,6 @@ tests += $(tests-ifunc) include ../Rules - tester-ENV = LANGUAGE=C inl-tester-ENV = LANGUAGE=C noinl-tester-ENV = LANGUAGE=C diff --git a/libc/sysdeps/unix/sysv/linux/i386/sysdep.h b/libc/sysdeps/unix/sysv/linux/i386/sysdep.h index 2fbb0f660..18b41e384 100644 --- a/libc/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/libc/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -27,10 +27,6 @@ #include #include -#if defined __i686 && defined __ASSEMBLER__ -#undef __i686 -#define __i686 __i686 -#endif /* For Linux we can use the system call table in the header file /usr/include/asm/unistd.h diff --git a/libc/timezone/Makefile b/libc/timezone/Makefile index e7370d3d9..5272c5508 100644 --- a/libc/timezone/Makefile +++ b/libc/timezone/Makefile @@ -52,16 +52,7 @@ endif include ../Rules -zic-objs = zic.o ialloc.o scheck.o - -$(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) - -$(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c - $(BUILD_CC) $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ - -DCROSS_ZIC $(compile-mkdep-flags) - -$(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) - $(BUILD_CC) $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ +$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o tz-cflags = -DTZDIR='"$(zonedir)"' \ -DTZDEFAULT='"$(localtime-file)"' \ @@ -78,17 +69,10 @@ CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID -DHAVE_GETTEXT # Don't add leapseconds here since test-tz made checks that work only without # leapseconds. testdata = $(objpfx)testdata -ifeq (no,$(cross-compiling)) define build-testdata GCONV_PATH=${common-objpfx}iconvdata LANGUAGE=C LC_ALL=C \ $(built-program-cmd) -d $(testdata) -y ./yearistype $< endef -else -define build-testdata -LANGUAGE=C LC_ALL=C \ - $(objpfx)cross-zic -d $(testdata) -y ./yearistype $< -endef -endif $(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC) $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \ @@ -101,11 +85,7 @@ test-tz-ENV = TZDIR=$(testdata) tst-timezone-ENV = TZDIR=$(testdata) # Note this must come second in the deps list for $(built-program-cmd) to work. -ifeq (no,$(cross-compiling)) zic-deps = $(objpfx)zic $(leapseconds) yearistype -else -zic-deps = $(objpfx)cross-zic $(objpfx)zic $(leapseconds) yearistype -endif $(testdata)/America/New_York: northamerica $(zic-deps) $(build-testdata) -- cgit v1.2.1