This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Re: [PATCH] PowerPC64 port part 5 of 7
- From: Andreas Jaeger <aj at suse dot de>
- To: Steven Munroe <sjmunroe at vnet dot ibm dot com>
- Cc: libc-alpha at sources dot redhat dot com
- Date: Tue, 20 Aug 2002 09:30:39 +0200
- Subject: Re: [PATCH] PowerPC64 port part 5 of 7
- References: <200208191853.g7JIr3s31687@skunk.rchland.ibm.com>
Steven Munroe <sjmunroe@vnet.ibm.com> writes:
> PowerPC64 part 5 of 7 follows:
>
> 2002-02-20 Steven Munroe <sjmunroe@us.ibm.com>
> * sysdeps/ieee754/dbl-64/s_atan.c: Add __atan symbol to be
> consistent with rest of libc.
> * sysdeps/ieee754/dbl-64/s_tan.c: Add __tan symbol to be consistent
> with rest of libc.
Do we want this consistency? I don't see why it's needed.
> 2002-02-20 Steven Munroe <sjmunroe@us.ibm.com>
>
> * catgets/Makefile: Condition tests on $(build-shared)
> * iconv/Makefile: Condition tests on $(build-shared)
> * iconvdata/Makefile: Condition tests on $(build-shared)
> * libio/Makefile: Condition tests on $(build-shared)
> * localedata/Makefile: Condition tests on $(build-shared)
> * posix/Makefile: Condition tests on $(build-shared)
> * rt/Makefile: Condition tests on $(build-shared)
> * stdio-common/Makefile: Condition tests on $(build-shared)
> * time/Makefile: Condition tests on $(build-shared)
> * wcsmbs/Makefile: Condition tests on $(build-shared)
> Allow glibc configured with --disable-shared and before shared
> libraries are working, to run make check.
This looks fine to me.
Uli, shall I commit both chunks, only the latter one - or none? I
guess this should go to mainline only.
Before committing I would clean up the patch (remove whitespace, fix
comments).
>
>>>>>>>>> ppc64-glibc-20020815.patch
> diff -rc2PN -x *.orig libc23-cvstip-20020815/sysdeps/ieee754/dbl-64/s_atan.c libc23/sysdeps/ieee754/dbl-64/s_atan.c
> *** libc23-cvstip-20020815/sysdeps/ieee754/dbl-64/s_atan.c Sat Jul 6 01:36:00 2002
> --- libc23/sysdeps/ieee754/dbl-64/s_atan.c Thu Aug 15 16:54:50 2002
> ***************
> *** 50,54 ****
> /* An ultimate atan() routine. Given an IEEE double machine number x, */
> /* routine computes the correctly rounded (to nearest) value of atan(x). */
> ! double atan(double x) {
>
>
> --- 50,54 ----
> /* An ultimate atan() routine. Given an IEEE double machine number x, */
> /* routine computes the correctly rounded (to nearest) value of atan(x). */
> ! double __atan(double x) {
>
>
> ***************
> *** 225,228 ****
> --- 225,230 ----
> return y1; /*if unpossible to do exact computing */
> }
> +
> + weak_alias (__atan, atan)
>
> #ifdef NO_LONG_DOUBLE
> diff -rc2PN -x *.orig libc23-cvstip-20020815/sysdeps/ieee754/dbl-64/s_tan.c libc23/sysdeps/ieee754/dbl-64/s_tan.c
> *** libc23-cvstip-20020815/sysdeps/ieee754/dbl-64/s_tan.c Sat Jul 6 01:36:00 2002
> --- libc23/sysdeps/ieee754/dbl-64/s_tan.c Thu Aug 15 16:54:50 2002
> ***************
> *** 43,47 ****
> void __mptan(double, mp_no *, int);
>
> ! double tan(double x) {
> #include "utan.h"
> #include "utan.tbl"
> --- 43,47 ----
> void __mptan(double, mp_no *, int);
>
> ! double __tan(double x) {
> #include "utan.h"
> #include "utan.tbl"
> ***************
> *** 481,484 ****
> --- 481,486 ----
> return y;
> }
> +
> + weak_alias (__tan, tan)
>
> #ifdef NO_LONG_DOUBLE
> diff -rc2PN -x *.orig libc23-cvstip-20020815/catgets/Makefile libc23/catgets/Makefile
> *** libc23-cvstip-20020815/catgets/Makefile Thu Jul 25 03:13:00 2002
> --- libc23/catgets/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 30,34 ****
> --- 30,36 ----
> extra-objs = $(gencat-modules:=.o)
>
> + ifeq (yes,$(build-shared))
> tests = tst-catgets
> + endif
> test-srcs = test-gencat
>
> ***************
> *** 54,57 ****
> --- 56,62 ----
>
> ifneq ($(cross-compiling),yes)
> +
> + ifeq (yes,$(build-shared))
> +
> tests: $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test-gencat.out
> # This test just checks whether the program produces any error or not.
> ***************
> *** 78,80 ****
> --- 83,86 ----
> GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
> $(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@
> + endif
> endif
> diff -rc2PN -x *.orig libc23-cvstip-20020815/iconv/Makefile libc23/iconv/Makefile
> *** libc23-cvstip-20020815/iconv/Makefile Sun Aug 4 15:13:04 2002
> --- libc23/iconv/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 29,33 ****
> --- 29,42 ----
> gconv_builtin gconv_simple gconv_trans gconv_cache
> ifeq ($(elf),yes)
> + ifeq ($(build-shared),yes)
> routines += gconv_dl
> + else
> + #
> + # Need to build with -DSTATIC_GCONV when not building shared libs
> + #
> + CFLAGS-gconv_db.c = -DSTATIC_GCONV
> + CFLAGS-gconv_cache.c = -DSTATIC_GCONV
> + CFLAGS-gconv_simple.c = -DSTATIC_GCONV
> + endif
> else
> CFLAGS-gconv_db.c = -DSTATIC_GCONV
> diff -rc2PN -x *.orig libc23-cvstip-20020815/iconvdata/Makefile libc23/iconvdata/Makefile
> *** libc23-cvstip-20020815/iconvdata/Makefile Sat Jul 27 03:06:14 2002
> --- libc23/iconvdata/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 314,319 ****
> --- 314,325 ----
> $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@
>
> +
> + ifeq (yes,$(build-shared))
> + #
> + # must have built with --enable-shared to run these
> + #
> $(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
> $(addprefix $(objpfx),$(modules.so))
> + endif
> $(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \
> $(addprefix $(objpfx),$(modules.so))
> diff -rc2PN -x *.orig libc23-cvstip-20020815/libio/Makefile libc23/libio/Makefile
> *** libc23-cvstip-20020815/libio/Makefile Thu Aug 1 20:27:59 2002
> --- libc23/libio/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 48,54 ****
> libc_fatal fmemopen
>
> ! tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
> ! tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-fopenloc \
> ! tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf \
> tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof \
> tst-freopen bug-rewind bug-ungetc bug-fseek \
> --- 48,54 ----
> libc_fatal fmemopen
>
> ! tests = tst_swprintf tst_wprintf tst_wscanf tst_getwc tst_putwc \
> ! tst_wprintf2 tst-widetext test-fmemopen tst-ext \
> ! tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-sscanf \
> tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof \
> tst-freopen bug-rewind bug-ungetc bug-fseek \
> ***************
> *** 60,63 ****
> --- 60,69 ----
>
> include ../Makeconfig
> +
> + # test $(build-shared) here becuase it is set by Makeconfig
> + ifeq ($(build-shared),yes)
> + # these test will not run with --disable-shared
> + tests += tst-fopenloc tst_swscanf tst-swscanf
> + endif
>
> ifeq ($(versioning),yes)
> ***************
> *** 113,116 ****
> --- 119,124 ----
> include ../Rules
>
> + # these test will not run with --disable-shared, so skip them
> + ifeq ($(build-shared),yes)
> ifeq (no,$(cross-compiling))
> tests: $(objpfx)test-freopen.out $(objpfx)tst-fopenloc.check
> ***************
> *** 125,126 ****
> --- 133,135 ----
> > $@
> $(common-objpfx)malloc/mtrace $(objpfx)tst-fopenloc.mtrace >> $@
> + endif
> diff -rc2PN -x *.orig libc23-cvstip-20020815/localedata/Makefile libc23/localedata/Makefile
> *** libc23-cvstip-20020815/localedata/Makefile Sat Aug 10 01:22:38 2002
> --- libc23/localedata/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 38,44 ****
>
>
> ! test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
> tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
> ! tst-ctype tst-wctype tst-langinfo
> test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
> hr_HR.ISO-8859-2 sv_SE.ISO-8859-1
> --- 38,44 ----
>
>
> ! test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch \
> tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
> ! tst-ctype tst-langinfo
> test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
> hr_HR.ISO-8859-2 sv_SE.ISO-8859-1
> ***************
> *** 74,100 ****
> # Get $(inst_i18ndir) defined.
> include ../Makeconfig
>
> ifeq (no,$(cross-compiling))
> locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \
> tst_iswctype tst_iswdigit tst_iswgraph \
> tst_iswlower tst_iswprint tst_iswpunct \
> ! tst_iswspace tst_iswupper tst_iswxdigit tst_mblen \
> ! tst_mbrlen tst_mbrtowc tst_mbsrtowcs tst_mbstowcs \
> ! tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm \
> ! tst_swscanf tst_towctrans tst_towlower \
> ! tst_towupper tst_wcrtomb tst_wcscat tst_wcschr \
> tst_wcscmp tst_wcscoll tst_wcscpy tst_wcscspn \
> tst_wcslen tst_wcsncat tst_wcsncmp tst_wcsncpy \
> ! tst_wcspbrk tst_wcsrtombs tst_wcsspn tst_wcsstr \
> ! tst_wcstod tst_wcstok tst_wcstombs tst_wcswidth \
> ! tst_wcsxfrm tst_wctob tst_wctomb tst_wctrans \
> tst_wctype tst_wcwidth
>
> ! tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
> ! tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2
> ifeq (yes,$(build-shared))
> ifneq (no,$(PERL))
> tests: $(objpfx)mtrace-tst-leaks
> endif
> endif
> endif
> --- 74,111 ----
> # Get $(inst_i18ndir) defined.
> include ../Makeconfig
> +
> + # static only builds dont support all locales,
> + # so enable only for shared builds
> + ifeq (yes,$(build-shared))
> + test-srcs += tst-trans tst-wctype
> + endif
>
> ifeq (no,$(cross-compiling))
> + # static only builds dont support all locales
> + # so initial only add this subset to tests
> locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \
> tst_iswctype tst_iswdigit tst_iswgraph \
> tst_iswlower tst_iswprint tst_iswpunct \
> ! tst_iswspace tst_iswupper tst_iswxdigit \
> ! tst_strcoll tst_strfmon tst_strxfrm \
> ! tst_towctrans tst_towlower \
> ! tst_towupper tst_wcscat tst_wcschr \
> tst_wcscmp tst_wcscoll tst_wcscpy tst_wcscspn \
> tst_wcslen tst_wcsncat tst_wcsncmp tst_wcsncpy \
> ! tst_wcspbrk tst_wcsspn tst_wcsstr \
> ! tst_wcstod tst_wcstok tst_wcswidth \
> ! tst_wcsxfrm tst_wctrans \
> tst_wctype tst_wcwidth
>
> ! tests = $(locale_test_suite) tst-leaks tst-xlocale1 tst-xlocale2
> ifeq (yes,$(build-shared))
> ifneq (no,$(PERL))
> tests: $(objpfx)mtrace-tst-leaks
> endif
> + # for --enable-shared builds add these tests
> + locale_test_suite += tst_mbrlen tst_mblen tst_mbrtowc tst_mbsrtowcs \
> + tst_mbstowcs tst_mbtowc tst_swscanf tst_wcrtomb \
> + tst_wcsrtombs tst_wcstombs tst_wctob tst_wctomb
> + tests += tst-digits tst-setlocale tst-mbswcs6 bug-iconv-trans
> endif
> endif
> ***************
> *** 148,155 ****
> --- 159,173 ----
> $(addprefix $(objpfx),$(CTYPE_FILES))
>
> + ifeq (yes,$(build-shared))
> tests: $(objpfx)sort-test.out $(objpfx)tst-fmon.out $(objpfx)tst-locale.out \
> $(objpfx)tst-rpmatch.out $(objpfx)tst-trans.out \
> $(objpfx)tst-mbswcs.out $(objpfx)tst-ctype.out $(objpfx)tst-wctype.out \
> $(objpfx)tst-langinfo.out
> + else
> + tests: $(objpfx)sort-test.out $(objpfx)tst-fmon.out $(objpfx)tst-locale.out \
> + $(objpfx)tst-rpmatch.out \
> + $(objpfx)tst-mbswcs.out $(objpfx)tst-ctype.out \
> + $(objpfx)tst-langinfo.out
> + endif
>
> $(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
> ***************
> *** 169,175 ****
> --- 187,197 ----
> $(addprefix $(objpfx),$(CTYPE_FILES))
> $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
> +
> + ifeq (yes,$(build-shared))
> $(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
> $(addprefix $(objpfx),$(CTYPE_FILES))
> $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
> + endif
> +
> $(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \
> $(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \
> ***************
> *** 181,188 ****
> --- 203,215 ----
> $(addprefix $(objpfx),$(CTYPE_FILES))
> $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
> +
> + ifeq (yes,$(build-shared))
> $(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
> $(objpfx)sort-test.out tst-wctype.input \
> $(addprefix $(objpfx),$(CTYPE_FILES))
> $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
> + endif
> +
> +
> $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
> $(objpfx)sort-test.out \
> diff -rc2PN -x *.orig libc23-cvstip-20020815/posix/Makefile libc23/posix/Makefile
> *** libc23-cvstip-20020815/posix/Makefile Mon Aug 12 14:20:52 2002
> --- libc23/posix/Makefile Thu Aug 15 16:33:13 2002
> ***************
> *** 72,80 ****
> tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \
> tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \
> ! tst-gnuglob tst-regex bug-regex5 bug-regex6 bug-regex7 \
> bug-regex8 bug-regex9
> ifeq (yes,$(build-shared))
> test-srcs := globtest
> ! tests += wordexp-test tst-exec tst-spawn
> endif
> others := getconf
> --- 72,80 ----
> tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \
> tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \
> ! tst-gnuglob bug-regex5 bug-regex6 bug-regex7 \
> bug-regex8 bug-regex9
> ifeq (yes,$(build-shared))
> test-srcs := globtest
> ! tests += wordexp-test tst-exec tst-spawn tst-regex
> endif
> others := getconf
> ***************
> *** 147,151 ****
> --- 147,155 ----
> tests: $(objpfx)annexc.out
> ifeq (no,$(cross-compiling))
> + ifeq (yes,$(build-shared))
> tests:$(objpfx)bug-regex2-mem $(objpfx)tst-getconf.out
> + else
> + tests:$(objpfx)bug-regex2-mem
> + endif
> endif
>
> diff -rc2PN -x *.orig libc23-cvstip-20020815/rt/Makefile libc23/rt/Makefile
> *** libc23-cvstip-20020815/rt/Makefile Mon Jul 8 12:03:31 2002
> --- libc23/rt/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 39,42 ****
> --- 39,57 ----
> $(shm-routines)
>
> + # fix for static links
> + ifeq (yes,$(build-static-nss))
> + tests-static = $(tests)
> + LDLIBS-tst-aio += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-aio64 += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-clock += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-shm += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-timer += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-aio2 += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-aio3 += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-aio4 += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-aio5 += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> + LDLIBS-tst-aio6 += libc nss/libnss_files resolv/libnss_dns resolv/libresolv
> +
> + endif
> tests := tst-shm tst-clock tst-timer
> ifeq ($(have-thread-library),yes)
> diff -rc2PN -x *.orig libc23-cvstip-20020815/stdio-common/Makefile libc23/stdio-common/Makefile
> *** libc23-cvstip-20020815/stdio-common/Makefile Fri Apr 5 19:12:00 2002
> --- libc23/stdio-common/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 46,50 ****
> distribute := _itoa.h _itowa.h _i18n_number.h \
> printf-parse.h stdio_lim.h.in tst-unbputc.sh tst-printf.sh
> !
> tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
> temptest tst-fileno test-fwrite tst-ungetc tst-ferror \
> --- 46,52 ----
> distribute := _itoa.h _itowa.h _i18n_number.h \
> printf-parse.h stdio_lim.h.in tst-unbputc.sh tst-printf.sh
> !
> ! # static only builds dont support all locales
> ! # so initial only add this subset to tests
> tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
> temptest tst-fileno test-fwrite tst-ungetc tst-ferror \
> ***************
> *** 54,59 ****
> scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \
> scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf tst-sscanf \
> ! tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
> tst-perror tst-sprintf tst-rndseek tst-fdopen
>
> test-srcs = tst-unbputc tst-printf
> --- 56,66 ----
> scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \
> scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf tst-sscanf \
> ! tst-fseek tst-fmemopen tst-gets \
> tst-perror tst-sprintf tst-rndseek tst-fdopen
> +
> + ifeq (yes,$(build-shared))
> + # for --enable-shared builds add these tests
> + tests += tst-swprintf test-vfprintf
> + endif
>
> test-srcs = tst-unbputc tst-printf
> diff -rc2PN -x *.orig libc23-cvstip-20020815/time/Makefile libc23/time/Makefile
> *** libc23-cvstip-20020815/time/Makefile Thu Aug 9 18:59:41 2001
> --- libc23/time/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 33,38 ****
> distribute := datemsk
>
> ! tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
> tst-getdate tst-mktime
>
> include ../Rules
> --- 33,43 ----
> distribute := datemsk
>
> ! tests := test_time clocktest tst-posixtz tst-strptime \
> tst-getdate tst-mktime
> +
> + include ../Makeconfig
> + ifeq (yes,$(build-shared))
> + tests += tst_wcsftime
> + endif
>
> include ../Rules
> diff -rc2PN -x *.orig libc23-cvstip-20020815/wcsmbs/Makefile libc23/wcsmbs/Makefile
> *** libc23-cvstip-20020815/wcsmbs/Makefile Sun Jul 21 23:39:37 2002
> --- libc23/wcsmbs/Makefile Thu Aug 15 16:54:50 2002
> ***************
> *** 40,45 ****
> wcsmbsload
>
> ! tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
> ! tst-wcrtomb
>
> include ../Rules
> --- 40,51 ----
> wcsmbsload
>
> ! # Static only builds don't support all locales
> ! # so initially add only this subset to tests.
> ! tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen
> !
> ! include ../Makeconfig
> ! ifeq (yes,$(build-shared))
> ! tests += tst-btowc tst-mbrtowc tst-wcrtomb
> ! endif
>
> include ../Rules
>
> <<<<<<<< ppc64-glibc-20020815.patch
>
Andreas
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj