mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 04:01:10 +00:00
c70e9913d2
This patch introduces a way to provide an architecture dependent gconv-modules file. Before this patch, the gconv-modules file was normally installed from src-dir/iconvdata/gconv-modules. The S390 Makefile had overridden the installation recipe (with a make warning) in order to install the gconv-module-s390 file from build-dir. The iconvdata/Makefile provides another recipe, which copies the gconv-modules file from src to build dir, which are used by the testcases. Thus the testcases does not use the currently build s390-modules. This patch uses build-dir/iconvdata/gconv-modules for installation, which is generated by concatenating src-dir/iconvdata/gconv-modules and the architecture specific one. The latter one can be specified by setting the variable sysdeps-gconv-modules in sysdeps/.../Makefile. The architecture specific gconv-modules file is emitted before the common one because these modules aren't used in all possible conversions. E.g. the converting from INTERNAL to UTF-16 used the common UTF-16.so module instead of UTF16_UTF32_Z9.so. This way, the s390-Makefile does not need to override the recipe for gconv-modules and no warning is emitted anymore. Since we no longer support empty objpfx the conditional test in iconvdata/Makefile is removed. ChangeLog: * iconvdata/Makefile ($(inst_gconvdir)/gconv-modules): Install file from $(objpfx)gconv-modules. ($(objpfx)gconv-modules): Concatenate architecture specific file in variable sysdeps-gconv-modules and gconv-modules in src dir. * sysdeps/s390/gconv-modules: New file. * sysdeps/s390/s390-64/Makefile: ($(inst_gconvdir)/gconv-modules): Deleted. ($(objpfx)gconv-modules-s390): Deleted. (sysdeps-gconv-modules): New variable. |
||
|---|---|---|
| .. | ||
| bits | ||
| multiarch | ||
| __longjmp.c | ||
| add_n.S | ||
| backtrace.c | ||
| bcopy.S | ||
| bsd-_setjmp.S | ||
| bsd-setjmp.S | ||
| bzero.S | ||
| crti.S | ||
| crtn.S | ||
| dl-machine.h | ||
| dl-trampoline.h | ||
| dl-trampoline.S | ||
| Implies | ||
| iso-8859-1_cp037_z900.c | ||
| Makefile | ||
| memchr.S | ||
| memcmp.S | ||
| memcpy.S | ||
| memset.S | ||
| s390x-mcount.S | ||
| setjmp.S | ||
| stackguard-macros.h | ||
| start.S | ||
| strcmp.S | ||
| strcpy.S | ||
| strncpy.S | ||
| sub_n.S | ||
| sysdep.h | ||
| tls-macros.h | ||
| tst-audit.h | ||
| utf8-utf16-z9.c | ||
| utf8-utf32-z9.c | ||
| utf16-utf32-z9.c | ||