CRUX-ARM : Home

Home :: Documentation :: Download :: Development :: Community :: Ports :: Packages :: Bugs :: Links :: About :: Donors
glibc: updated to 2.10.1 and fixed compilation issues.
authorVictor Martinez <pitillo@ono.com>
Wed, 16 Dec 2009 15:01:48 +0000 (15:01 +0000)
committerVictor Martinez <pitillo@ono.com>
Wed, 16 Dec 2009 15:01:48 +0000 (15:01 +0000)
glibc/.footprint
glibc/.md5sum
glibc/Pkgfile
glibc/glibc-2.10.1-cross_hacks-2.patch [moved from glibc/glibc-2.9-cross_hacks-2.patch with 62% similarity]
glibc/glibc-2.9-arm_setjmp_fix-1.patch [deleted file]
glibc/glibc-2.9-libgcc_eh-1.patch [deleted file]
glibc/glibc-2.9-localedef_segfault-1.patch [deleted file]
glibc/glibc-2.9-nptl_lowlevellock-1.patch [deleted file]

index b2d99db41800e22da0442e92bdb8635341276257..d4ee1fc98a8f2c5d2d1e7201dc2f4bf76d5096c4 100644 (file)
@@ -8,47 +8,47 @@ lrwxrwxrwx    root/root       etc/localtime -> ../usr/share/zoneinfo/UTC
 -rw-r--r--     root/root       etc/resolv.conf
 -rw-r--r--     root/root       etc/rpc
 drwxr-xr-x     root/root       lib/
--rwxr-xr-x     root/root       lib/ld-2.9.so
-lrwxrwxrwx     root/root       lib/ld-linux.so.2 -> ld-2.9.so
--rwxr-xr-x     root/root       lib/libBrokenLocale-2.9.so
-lrwxrwxrwx     root/root       lib/libBrokenLocale.so.1 -> libBrokenLocale-2.9.so
+-rwxr-xr-x     root/root       lib/ld-2.10.1.so
+lrwxrwxrwx     root/root       lib/ld-linux.so.2 -> ld-2.10.1.so
+-rwxr-xr-x     root/root       lib/libBrokenLocale-2.10.1.so
+lrwxrwxrwx     root/root       lib/libBrokenLocale.so.1 -> libBrokenLocale-2.10.1.so
 -rwxr-xr-x     root/root       lib/libSegFault.so
--rwxr-xr-x     root/root       lib/libanl-2.9.so
-lrwxrwxrwx     root/root       lib/libanl.so.1 -> libanl-2.9.so
--rwxr-xr-x     root/root       lib/libc-2.9.so
-lrwxrwxrwx     root/root       lib/libc.so.6 -> libc-2.9.so
--rwxr-xr-x     root/root       lib/libcrypt-2.9.so
-lrwxrwxrwx     root/root       lib/libcrypt.so.1 -> libcrypt-2.9.so
--rwxr-xr-x     root/root       lib/libdl-2.9.so
-lrwxrwxrwx     root/root       lib/libdl.so.2 -> libdl-2.9.so
--rwxr-xr-x     root/root       lib/libm-2.9.so
-lrwxrwxrwx     root/root       lib/libm.so.6 -> libm-2.9.so
+-rwxr-xr-x     root/root       lib/libanl-2.10.1.so
+lrwxrwxrwx     root/root       lib/libanl.so.1 -> libanl-2.10.1.so
+-rwxr-xr-x     root/root       lib/libc-2.10.1.so
+lrwxrwxrwx     root/root       lib/libc.so.6 -> libc-2.10.1.so
+-rwxr-xr-x     root/root       lib/libcrypt-2.10.1.so
+lrwxrwxrwx     root/root       lib/libcrypt.so.1 -> libcrypt-2.10.1.so
+-rwxr-xr-x     root/root       lib/libdl-2.10.1.so
+lrwxrwxrwx     root/root       lib/libdl.so.2 -> libdl-2.10.1.so
+-rwxr-xr-x     root/root       lib/libm-2.10.1.so
+lrwxrwxrwx     root/root       lib/libm.so.6 -> libm-2.10.1.so
 -rwxr-xr-x     root/root       lib/libmemusage.so
--rwxr-xr-x     root/root       lib/libnsl-2.9.so
-lrwxrwxrwx     root/root       lib/libnsl.so.1 -> libnsl-2.9.so
--rwxr-xr-x     root/root       lib/libnss_compat-2.9.so
-lrwxrwxrwx     root/root       lib/libnss_compat.so.2 -> libnss_compat-2.9.so
--rwxr-xr-x     root/root       lib/libnss_dns-2.9.so
-lrwxrwxrwx     root/root       lib/libnss_dns.so.2 -> libnss_dns-2.9.so
--rwxr-xr-x     root/root       lib/libnss_files-2.9.so
-lrwxrwxrwx     root/root       lib/libnss_files.so.2 -> libnss_files-2.9.so
--rwxr-xr-x     root/root       lib/libnss_hesiod-2.9.so
-lrwxrwxrwx     root/root       lib/libnss_hesiod.so.2 -> libnss_hesiod-2.9.so
--rwxr-xr-x     root/root       lib/libnss_nis-2.9.so
-lrwxrwxrwx     root/root       lib/libnss_nis.so.2 -> libnss_nis-2.9.so
--rwxr-xr-x     root/root       lib/libnss_nisplus-2.9.so
-lrwxrwxrwx     root/root       lib/libnss_nisplus.so.2 -> libnss_nisplus-2.9.so
+-rwxr-xr-x     root/root       lib/libnsl-2.10.1.so
+lrwxrwxrwx     root/root       lib/libnsl.so.1 -> libnsl-2.10.1.so
+-rwxr-xr-x     root/root       lib/libnss_compat-2.10.1.so
+lrwxrwxrwx     root/root       lib/libnss_compat.so.2 -> libnss_compat-2.10.1.so
+-rwxr-xr-x     root/root       lib/libnss_dns-2.10.1.so
+lrwxrwxrwx     root/root       lib/libnss_dns.so.2 -> libnss_dns-2.10.1.so
+-rwxr-xr-x     root/root       lib/libnss_files-2.10.1.so
+lrwxrwxrwx     root/root       lib/libnss_files.so.2 -> libnss_files-2.10.1.so
+-rwxr-xr-x     root/root       lib/libnss_hesiod-2.10.1.so
+lrwxrwxrwx     root/root       lib/libnss_hesiod.so.2 -> libnss_hesiod-2.10.1.so
+-rwxr-xr-x     root/root       lib/libnss_nis-2.10.1.so
+lrwxrwxrwx     root/root       lib/libnss_nis.so.2 -> libnss_nis-2.10.1.so
+-rwxr-xr-x     root/root       lib/libnss_nisplus-2.10.1.so
+lrwxrwxrwx     root/root       lib/libnss_nisplus.so.2 -> libnss_nisplus-2.10.1.so
 -rwxr-xr-x     root/root       lib/libpcprofile.so
--rwxr-xr-x     root/root       lib/libpthread-2.9.so
-lrwxrwxrwx     root/root       lib/libpthread.so.0 -> libpthread-2.9.so
--rwxr-xr-x     root/root       lib/libresolv-2.9.so
-lrwxrwxrwx     root/root       lib/libresolv.so.2 -> libresolv-2.9.so
--rwxr-xr-x     root/root       lib/librt-2.9.so
-lrwxrwxrwx     root/root       lib/librt.so.1 -> librt-2.9.so
+-rwxr-xr-x     root/root       lib/libpthread-2.10.1.so
+lrwxrwxrwx     root/root       lib/libpthread.so.0 -> libpthread-2.10.1.so
+-rwxr-xr-x     root/root       lib/libresolv-2.10.1.so
+lrwxrwxrwx     root/root       lib/libresolv.so.2 -> libresolv-2.10.1.so
+-rwxr-xr-x     root/root       lib/librt-2.10.1.so
+lrwxrwxrwx     root/root       lib/librt.so.1 -> librt-2.10.1.so
 -rwxr-xr-x     root/root       lib/libthread_db-1.0.so
 lrwxrwxrwx     root/root       lib/libthread_db.so.1 -> libthread_db-1.0.so
--rwxr-xr-x     root/root       lib/libutil-2.9.so
-lrwxrwxrwx     root/root       lib/libutil.so.1 -> libutil-2.9.so
+-rwxr-xr-x     root/root       lib/libutil-2.10.1.so
+lrwxrwxrwx     root/root       lib/libutil.so.1 -> libutil-2.10.1.so
 drwxr-xr-x     root/root       sbin/
 -rwxr-xr-x     root/root       sbin/ldconfig
 -rwxr-xr-x     root/root       sbin/sln
@@ -130,6 +130,7 @@ drwxr-xr-x  root/root       usr/include/asm/
 -rw-r--r--     root/root       usr/include/asm/sockios.h
 -rw-r--r--     root/root       usr/include/asm/stat.h
 -rw-r--r--     root/root       usr/include/asm/statfs.h
+-rw-r--r--     root/root       usr/include/asm/swab.h
 -rw-r--r--     root/root       usr/include/asm/termbits.h
 -rw-r--r--     root/root       usr/include/asm/termios.h
 -rw-r--r--     root/root       usr/include/asm/types.h
@@ -248,6 +249,7 @@ drwxr-xr-x  root/root       usr/include/drm/
 -rw-r--r--     root/root       usr/include/drm/..install.cmd
 -rw-r--r--     root/root       usr/include/drm/.install (EMPTY)
 -rw-r--r--     root/root       usr/include/drm/drm.h
+-rw-r--r--     root/root       usr/include/drm/drm_mode.h
 -rw-r--r--     root/root       usr/include/drm/drm_sarea.h
 -rw-r--r--     root/root       usr/include/drm/i810_drm.h
 -rw-r--r--     root/root       usr/include/drm/i830_drm.h
@@ -283,6 +285,7 @@ drwxr-xr-x  root/root       usr/include/gnu/
 -rw-r--r--     root/root       usr/include/gnu/libc-version.h
 -rw-r--r--     root/root       usr/include/gnu/stubs.h
 -rw-r--r--     root/root       usr/include/grp.h
+-rw-r--r--     root/root       usr/include/gshadow.h
 -rw-r--r--     root/root       usr/include/iconv.h
 -rw-r--r--     root/root       usr/include/ieee754.h
 -rw-r--r--     root/root       usr/include/ifaddrs.h
@@ -338,14 +341,11 @@ drwxr-xr-x        root/root       usr/include/linux/
 -rw-r--r--     root/root       usr/include/linux/blktrace_api.h
 -rw-r--r--     root/root       usr/include/linux/bpqether.h
 -rw-r--r--     root/root       usr/include/linux/bsg.h
--rw-r--r--     root/root       usr/include/linux/byteorder.h
 drwxr-xr-x     root/root       usr/include/linux/byteorder/
 -rw-r--r--     root/root       usr/include/linux/byteorder/..install.cmd
 -rw-r--r--     root/root       usr/include/linux/byteorder/.install (EMPTY)
 -rw-r--r--     root/root       usr/include/linux/byteorder/big_endian.h
 -rw-r--r--     root/root       usr/include/linux/byteorder/little_endian.h
--rw-r--r--     root/root       usr/include/linux/byteorder/swab.h
--rw-r--r--     root/root       usr/include/linux/byteorder/swabb.h
 -rw-r--r--     root/root       usr/include/linux/can.h
 drwxr-xr-x     root/root       usr/include/linux/can/
 -rw-r--r--     root/root       usr/include/linux/can/..install.cmd
@@ -372,6 +372,7 @@ drwxr-xr-x  root/root       usr/include/linux/can/
 -rw-r--r--     root/root       usr/include/linux/cuda.h
 -rw-r--r--     root/root       usr/include/linux/cyclades.h
 -rw-r--r--     root/root       usr/include/linux/cycx_cfm.h
+-rw-r--r--     root/root       usr/include/linux/dcbnl.h
 -rw-r--r--     root/root       usr/include/linux/dccp.h
 -rw-r--r--     root/root       usr/include/linux/dlm.h
 -rw-r--r--     root/root       usr/include/linux/dlm_device.h
@@ -380,8 +381,6 @@ drwxr-xr-x  root/root       usr/include/linux/can/
 -rw-r--r--     root/root       usr/include/linux/dlmconstants.h
 -rw-r--r--     root/root       usr/include/linux/dm-ioctl.h
 -rw-r--r--     root/root       usr/include/linux/dn.h
--rw-r--r--     root/root       usr/include/linux/dqblk_v1.h
--rw-r--r--     root/root       usr/include/linux/dqblk_v2.h
 -rw-r--r--     root/root       usr/include/linux/dqblk_xfs.h
 drwxr-xr-x     root/root       usr/include/linux/dvb/
 -rw-r--r--     root/root       usr/include/linux/dvb/..install.cmd
@@ -493,6 +492,7 @@ drwxr-xr-x  root/root       usr/include/linux/hdlc/
 -rw-r--r--     root/root       usr/include/linux/ipv6_route.h
 -rw-r--r--     root/root       usr/include/linux/ipx.h
 -rw-r--r--     root/root       usr/include/linux/irda.h
+-rw-r--r--     root/root       usr/include/linux/irqnr.h
 -rw-r--r--     root/root       usr/include/linux/isdn.h
 drwxr-xr-x     root/root       usr/include/linux/isdn/
 -rw-r--r--     root/root       usr/include/linux/isdn/..install.cmd
@@ -744,8 +744,6 @@ drwxr-xr-x  root/root       usr/include/linux/nfsd/
 -rw-r--r--     root/root       usr/include/linux/qnx4_fs.h
 -rw-r--r--     root/root       usr/include/linux/qnxtypes.h
 -rw-r--r--     root/root       usr/include/linux/quota.h
--rw-r--r--     root/root       usr/include/linux/quotaio_v1.h
--rw-r--r--     root/root       usr/include/linux/quotaio_v2.h
 -rw-r--r--     root/root       usr/include/linux/radeonfb.h
 drwxr-xr-x     root/root       usr/include/linux/raid/
 -rw-r--r--     root/root       usr/include/linux/raid/..install.cmd
@@ -873,6 +871,11 @@ drwxr-xr-x root/root       usr/include/linux/usb/
 -rw-r--r--     root/root       usr/include/linux/wait.h
 -rw-r--r--     root/root       usr/include/linux/wanrouter.h
 -rw-r--r--     root/root       usr/include/linux/watchdog.h
+-rw-r--r--     root/root       usr/include/linux/wimax.h
+drwxr-xr-x     root/root       usr/include/linux/wimax/
+-rw-r--r--     root/root       usr/include/linux/wimax/..install.cmd
+-rw-r--r--     root/root       usr/include/linux/wimax/.install (EMPTY)
+-rw-r--r--     root/root       usr/include/linux/wimax/i2400m.h
 -rw-r--r--     root/root       usr/include/linux/wireless.h
 -rw-r--r--     root/root       usr/include/linux/x25.h
 -rw-r--r--     root/root       usr/include/linux/xattr.h
@@ -1827,6 +1830,7 @@ drwxr-xr-x        root/root       usr/share/i18n/locales/
 -rw-r--r--     root/root       usr/share/i18n/locales/ha_NG
 -rw-r--r--     root/root       usr/share/i18n/locales/he_IL
 -rw-r--r--     root/root       usr/share/i18n/locales/hi_IN
+-rw-r--r--     root/root       usr/share/i18n/locales/hne_IN
 -rw-r--r--     root/root       usr/share/i18n/locales/hr_HR
 -rw-r--r--     root/root       usr/share/i18n/locales/hsb_DE
 -rw-r--r--     root/root       usr/share/i18n/locales/ht_HT
@@ -1852,6 +1856,7 @@ drwxr-xr-x        root/root       usr/share/i18n/locales/
 -rw-r--r--     root/root       usr/share/i18n/locales/km_KH
 -rw-r--r--     root/root       usr/share/i18n/locales/kn_IN
 -rw-r--r--     root/root       usr/share/i18n/locales/ko_KR
+-rw-r--r--     root/root       usr/share/i18n/locales/ks_IN
 -rw-r--r--     root/root       usr/share/i18n/locales/ks_IN@devanagari
 -rw-r--r--     root/root       usr/share/i18n/locales/ku_TR
 -rw-r--r--     root/root       usr/share/i18n/locales/kw_GB
@@ -1871,6 +1876,7 @@ drwxr-xr-x        root/root       usr/share/i18n/locales/
 -rw-r--r--     root/root       usr/share/i18n/locales/mr_IN
 -rw-r--r--     root/root       usr/share/i18n/locales/ms_MY
 -rw-r--r--     root/root       usr/share/i18n/locales/mt_MT
+-rw-r--r--     root/root       usr/share/i18n/locales/nan_TW@latin
 -rw-r--r--     root/root       usr/share/i18n/locales/nb_NO
 -rw-r--r--     root/root       usr/share/i18n/locales/nds_DE
 -rw-r--r--     root/root       usr/share/i18n/locales/nds_NL
index 8fa1f2d225148e4396b9801f24f3899452a28b04..89946598b2c67cc4d0c63a5c100f4e9b33fad918 100644 (file)
@@ -1,13 +1,9 @@
-e7a669566af4c79251399fcad858b290  glibc-2.9-arm_setjmp_fix-1.patch
-65c72652824b4faa0d9fbcf291151e10  glibc-2.9-cross_hacks-2.patch
-1b5106b91ff4111fd97aba99437023ed  glibc-2.9-libgcc_eh-1.patch
-a52ecc9fc4ebb6677b772e37ab258120  glibc-2.9-localedef_segfault-1.patch
-0a428774cf459cf5fd23ff219390c141  glibc-2.9-nptl_lowlevellock-1.patch
-fc62e989cf31d015f31628609fc3757a  glibc-2.9.tar.bz2
-7d5d86031cb15403e4d246658209ee81  glibc-ports-2.9.tar.bz2
+e23330017aa00167adb2c25f0d710c6d  glibc-2.10.1-cross_hacks-2.patch
+ee71dedf724dc775e4efec9b823ed3be  glibc-2.10.1.tar.bz2
+816b2d48a95ddc23b27fea03a1996443  glibc-ports-2.10.1.tar.bz2
 96156bec8e05de67384dc93e72bdc313  host.conf
 fbbc215a9b15ba4846f326cc88108057  hosts
 f7fefce570a3c776e26e778c5e401490  ld.so.conf
-8440a90637cff154195895743ef498a1  linux-2.6.28.8.tar.bz2
+64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 75931315bf9bc9be15a5e25e4ddd5f0d  nsswitch.conf
 acf9daad1ee85de5efd3543965596a63  resolv.conf
index a175ac2d387affa3b3299083cb3cc34fe322eb48..afc324e0970053e68a14653b5f736f633c13529b 100644 (file)
@@ -5,42 +5,32 @@
 # Depends on:
 
 name=glibc
-version=2.9
+version=2.10.1
 release=1
 source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2 \
         ftp://ftp.gnu.org/gnu/$name/$name-ports-$version.tar.bz2 \
-        $name-$version-libgcc_eh-1.patch \ 
-        $name-$version-localedef_segfault-1.patch \
+        ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 \
         $name-$version-cross_hacks-2.patch \
-        $name-$version-nptl_lowlevellock-1.patch \
-        $name-$version-arm_setjmp_fix-1.patch \
-        ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.8.tar.bz2 \
         hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
 
 build() {
   # install build kernel headers
-  cd linux-2.6.28.8
+  cd linux-2.6.29
   make mrproper
   make ARCH=arm headers_check
   make ARCH=arm INSTALL_HDR_PATH=$PKG/usr headers_install
-  cd $SRC
 
+  cd $SRC
   mv $name-ports-$version $name-$version/ports
 
   pushd $name-$version
-  patch -p1 -i $SRC/$name-$version-libgcc_eh-1.patch
-  patch -p1 -i $SRC/$name-$version-localedef_segfault-1.patch
   patch -p1 -i $SRC/$name-$version-cross_hacks-2.patch
-  patch -p1 -i $SRC/$name-$version-nptl_lowlevellock-1.patch
-  patch -p1 -i $SRC/$name-$version-arm_setjmp_fix-1.patch
   popd
 
   mkdir build
   cd build
-  
-  cat > config.cache << EOF 
-libc_cv_forced_unwind=yes
-libc_cv_c_cleanup=yes
+
+  cat > config.cache << EOF
 libc_cv_gnu89_inline=yes
 ac_cv_sizeof_long_double=0
 EOF
@@ -55,15 +45,16 @@ EOF
                               --enable-add-ons \
                               --disable-profile \
                               --without-gd \
-                              --cache-file=config.cache
+                              --with-__thread 
 
   make CC="$CC" CFLAGS="$CFLAGS"
   make install_root=$PKG install
+
   cp $SRC/{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc
   ln -sf ../usr/share/zoneinfo/UTC $PKG/etc/localtime
   mkdir -p $PKG/etc/ld.so.conf.d $PKG/usr/lib/locale
 
   # conflicts with quota
-  rm $PKG/usr/include/rpcsvc/{rquota.h,rquota.x}
+  rm $PKG/usr/include/rpcsvc/{rquota.x,rquota.h}
   rm -rf $PKG/usr/share/{info,locale}
 }
similarity index 62%
rename from glibc/glibc-2.9-cross_hacks-2.patch
rename to glibc/glibc-2.10.1-cross_hacks-2.patch
index dfdc2db2f6c8cfd81c5ea1be988d1789798073eb..fba564ff7794aad3618c69d996bfd7e807004ab3 100644 (file)
@@ -69,403 +69,6 @@ diff -Naur glibc-2.9.orig/iconvdata/Makefile glibc-2.9/iconvdata/Makefile
  
  endif # build-shared = yes
  
-diff -Naur glibc-2.9.orig/iconvdata/Makefile.orig glibc-2.9/iconvdata/Makefile.orig
---- glibc-2.9.orig/iconvdata/Makefile.orig     1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/iconvdata/Makefile.orig  2008-05-14 21:54:31.000000000 -0400
-@@ -0,0 +1,393 @@
-+# Copyright (C) 1997-2004,2005,2006,2007,2008 Free Software Foundation, Inc.
-+# This file is part of the GNU C Library.
-+
-+# The GNU C Library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+
-+# The GNU C Library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Lesser General Public License for more details.
-+
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with the GNU C Library; if not, write to the Free
-+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+# 02111-1307 USA.
-+
-+#
-+#     Makefile for iconv data and code.
-+#
-+subdir        := iconvdata
-+
-+# Names of all the shared objects which implement the transformations.
-+modules       := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5             \
-+         ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10            \
-+         ISO8859-11 ISO8859-13 ISO8859-14 ISO8859-15 ISO8859-16        \
-+         T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 HP-ROMAN9 EBCDIC-AT-DE     \
-+         EBCDIC-AT-DE-A EBCDIC-CA-FR EUC-KR UHC JOHAB libJIS libKSC    \
-+         BIG5 EUC-JP libGB EUC-CN libCNS EUC-TW ISO646 EBCDIC-DK-NO    \
-+         EBCDIC-DK-NO-A EBCDIC-ES EBCDIC-ES-A EBCDIC-ES-S EBCDIC-FI-SE \
-+         EBCDIC-FI-SE-A EBCDIC-FR EBCDIC-IS-FRISS EBCDIC-IT EBCDIC-PT  \
-+         EBCDIC-UK EBCDIC-US IBM037 IBM038 IBM274 IBM275 IBM423        \
-+         IBM500 IBM870 IBM871 IBM891 IBM903 IBM904 IBM905 IBM1047      \
-+         IBM874 CP737 CP775 ISO-2022-KR HP-TURKISH8 HP-THAI8 HP-GREEK8 \
-+         KOI8-R LATIN-GREEK LATIN-GREEK-1 IBM256 IBM273 IBM277 IBM278  \
-+         IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 IBM424       \
-+         IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861       \
-+         IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 IBM880       \
-+         IBM866 CP1258 IBM922 IBM1124 IBM1129 IBM932 IBM943            \
-+         IBM856 IBM930 IBM933 IBM935 IBM937 IBM939 IBM1046             \
-+         IBM1132 IBM1133 IBM1160 IBM1161 IBM1162 IBM1163 IBM1164       \
-+         IBM918 IBM1004 IBM1026 CP1125 CP1250 CP1251 CP1252 CP1253     \
-+         CP1254 CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1   \
-+         ASMO_449 ANSI_X3.110 CSN_369103 CWI DEC-MCS ECMA-CYRILLIC     \
-+         GOST_19768-74 GREEK-CCITT GREEK7 GREEK7-OLD INIS INIS-8       \
-+         INIS-CYRILLIC ISO_6937-2 ISO_2033 ISO_5427 ISO_5427-EXT       \
-+         ISO_5428 ISO_10367-BOX MAC-IS MAC-UK NATS-DANO NATS-SEFI      \
-+         SAMI-WS2 ISO-IR-197 TIS-620 KOI8-U GBK ISIRI-3342 GBGBK       \
-+         ISO-2022-CN libISOIR165 UTF-16 UNICODE UTF-32 UTF-7 BIG5HKSCS \
-+         GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T          \
-+         GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI ARMSCII-8    \
-+         TCVN5712-1 libJISX0213 EUC-JISX0213 SHIFT_JISX0213            \
-+         ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS PT154 RK1048    \
-+         IBM1025 IBM1122 IBM1137 IBM1153 IBM1154 IBM1155 IBM1156       \
-+         IBM1157 IBM1158 IBM803 IBM901 IBM902 IBM921 IBM1008           \
-+         IBM1008_420 IBM1097 IBM1112 IBM1123 IBM1130 IBM1140 IBM1141   \
-+         IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148       \
-+         IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971       \
-+         IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804             \
-+         IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF   \
-+         MAC-CENTRALEUROPE KOI8-RU ISO8859-9E
-+
-+modules.so := $(addsuffix .so, $(modules))
-+
-+include ../Makeconfig
-+
-+ifeq (yes,$(build-shared))
-+tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
-+      tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7
-+ifeq ($(have-thread-library),yes)
-+tests += bug-iconv3
-+endif
-+
-+test-srcs := tst-table-from tst-table-to
-+
-+bug-iconv6-ENV = LOCPATH=$(common-objpfx)localedata
-+tst-iconv7-ENV = LOCPATH=$(common-objpfx)localedata
-+endif
-+
-+# No code here is in libc.so.
-+CPPFLAGS += -DNOT_IN_libc
-+
-+libJIS-routines := jis0201 jis0208 jis0212
-+libKSC-routines := ksc5601
-+libGB-routines := gb2312
-+libCNS-routines := cns11643l1 cns11643
-+libISOIR165-routines := iso-ir-165
-+libJISX0213-routines := jisx0213
-+
-+LDFLAGS-EUC-KR.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-KR.so: $(objpfx)libKSC.so
-+LDFLAGS-JOHAB.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)JOHAB.so: $(objpfx)libKSC.so
-+LDFLAGS-UHC.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)UHC.so: $(objpfx)libKSC.so
-+LDFLAGS-EUC-JP.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-JP.so: $(objpfx)libJIS.so
-+LDFLAGS-EUC-JP-MS.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-JP-MS.so: $(objpfx)libJIS.so
-+LDFLAGS-EUC-CN.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-CN.so: $(objpfx)libGB.so
-+LDFLAGS-EUC-TW.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-TW.so: $(objpfx)libCNS.so
-+LDFLAGS-EUC-JISX0213.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-JISX0213.so: $(objpfx)libJISX0213.so
-+LDFLAGS-SHIFT_JISX0213.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)SHIFT_JISX0213.so: $(objpfx)libJISX0213.so
-+
-+LDFLAGS-ISO-2022-JP.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-JP.so: $(objpfx)libJIS.so $(objpfx)libGB.so \
-+                       $(objpfx)libCNS.so $(objpfx)libKSC.so
-+LDFLAGS-ISO-2022-JP-3.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-JP-3.so: $(objpfx)libJIS.so $(objpfx)libJISX0213.so
-+LDFLAGS-ISO-2022-KR.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-KR.so: $(objpfx)libKSC.so
-+LDFLAGS-ISO-2022-CN.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-CN.so: $(objpfx)libGB.so $(objpfx)libCNS.so
-+LDFLAGS-ISO-2022-CN-EXT.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-CN-EXT.so: $(objpfx)libGB.so $(objpfx)libCNS.so \
-+                           $(objpfx)libISOIR165.so
-+
-+LDFLAGS-libJIS.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libKSC.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libGB.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libCNS.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libISOIR165.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libJISX0213.so = $(LDFLAGS-soname-fname)
-+
-+distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
-+            gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh                 \
-+            TESTS $(filter-out testdata/CVS%, $(wildcard testdata/*))     \
-+            TESTS2 run-iconv-test.sh tst-tables.sh tst-table.sh           \
-+            tst-table-charmap.sh tst-table-from.c tst-table-to.c          \
-+            EUC-JP.irreversible ISIRI-3342.irreversible SJIS.irreversible \
-+            EUC-KR.irreversible BIG5HKSCS.irreversible BIG5.irreversible  \
-+            CP1255.irreversible CP1258.irreversible EUC-TW.irreversible   \
-+            IBM856.irreversible IBM922.irreversible IBM1132.irreversible  \
-+            IBM1133.irreversible IBM1160.irreversible IBM1161.irreversible\
-+            IBM1163.irreversible IBM1164.irreversible                     \
-+            ARMSCII-8.irreversible TCVN5712-1.precomposed                 \
-+            JISX0213.TXT EUC-JISX0213.precomposed                         \
-+            SHIFT_JISX0213.precomposed SHIFT_JISX0213.irreversible        \
-+            TSCII.irreversible TSCII.precomposed                          \
-+            8bit-generic.c 8bit-gap.c                                     \
-+            ansi_x3.110.c asmo_449.c big5.c cp737.c cp737.h               \
-+            cp775.c cp775.h ibm874.c cns11643.c cns11643.h                \
-+            cns11643l1.c cns11643l1.h cp1125.c cp1250.c cp1251.c cp1252.c \
-+            cp1253.c cp1254.c cp1255.c cp1256.c cp1257.c cp1258.c         \
-+            csn_369103.c cwi.c dec-mcs.c ebcdic-at-de.c ebcdic-at-de-a.c  \
-+            ebcdic-ca-fr.c ebcdic-dk-no.c ebcdic-dk-no-a.c ebcdic-es.c    \
-+            ebcdic-es-a.c ebcdic-es-s.c ebcdic-fr.c ebcdic-fi-se.c        \
-+            ebcdic-fi-se-a.c ebcdic-is-friss.c ebcdic-it.c ebcdic-pt.c    \
-+            ebcdic-uk.c ebcdic-us.c ecma-cyrillic.c euc-cn.c euc-jp.c     \
-+            euc-kr.c euc-tw.c gb2312.c gb2312.h gbk.c gost_19768-74.c     \
-+            greek-ccitt.c greek7.c greek7-old.c hp-roman8.c ibm037.c      \
-+            ibm038.c ibm256.c ibm273.c ibm274.c ibm275.c ibm277.c         \
-+            ibm278.c ibm280.c ibm281.c ibm284.c ibm285.c ibm290.c         \
-+            ibm297.c ibm420.c ibm423.c ibm424.c ibm437.c ibm500.c         \
-+            ibm850.c ibm851.c ibm852.c ibm855.c ibm857.c ibm860.c         \
-+            ibm861.c ibm862.c ibm863.c ibm864.c ibm865.c ibm866.c         \
-+            ibm868.c ibm869.c ibm870.c ibm871.c ibm875.c ibm880.c         \
-+            ibm891.c ibm903.c ibm904.c ibm905.c ibm918.c ibm1004.c        \
-+            ibm856.c ibm930.c ibm933.c ibm935.c ibm937.c ibm939.c ibm1046.c \
-+            ibm856.h ibm930.h ibm933.h ibm935.h ibm937.h ibm939.h ibm1046.h \
-+            ibm922.c ibm922.h ibm1124.c ibm1124.h ibm1129.c ibm1129.h     \
-+            ibm1132.c ibm1132.h ibm1133.c ibm1133.h ibm1162.c ibm1162.h   \
-+            ibm1026.c ibm1047.c iec_p27-1.c inis.c inis-8.c viscii.c      \
-+            inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c          \
-+            iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c   \
-+            iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c  \
-+            iso8859-11.c iso8859-13.c iso8859-14.c iso8859-9e.c           \
-+            iso8859-15.c iso_2033.c iso_5427-ext.c iso_5427.c iso_5428.c  \
-+            iso_6937.c iso_6937-2.c iso_10367-box.c jis0201.c jis0201.h   \
-+            jis0208.c jis0208.h jis0212.c jis0212.h johab.c koi-8.c       \
-+            koi8-r.c ksc5601.c ksc5601.h latin-greek.c latin-greek-1.c    \
-+            macintosh.c mac-is.c mac-uk.c nats-dano.c nats-sefi.c sjis.c  \
-+            t.61.c uhc.c sami-ws2.c iso-ir-197.c tis-620.c koi8-u.c       \
-+            isiri-3342.c isiri-3342.h gbgbk.c iso-2022-cn.c cns11643l2.h  \
-+            iso8859-16.c utf-16.c unicode.c utf-32.c utf-7.c big5hkscs.c  \
-+            iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c         \
-+            ibm932.c ibm932.h ibm943.c ibm943.h gbbig5.c cp10007.c        \
-+            koi8-t.c georgian-ps.c georgian-academy.c iso-ir-209.c        \
-+            mac-sami.c ibm1160.c ibm1160.h ibm1161.c ibm1161.h            \
-+            ibm1163.c ibm1163.h ibm1164.c ibm1164.h jisx0213.c jisx0213.h \
-+            euc-jisx0213.c shift_jisx0213.c iso-2022-jp-3.c               \
-+            tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c pt154.c rk1048.c \
-+            ibm1025.c ibm1025.h ibm1122.c ibm1122.h ibm1137.c ibm1137.h   \
-+            ibm1153.c ibm1153.h ibm1154.c ibm1154.h ibm1155.c ibm1155.h   \
-+            ibm1156.c ibm1156.h ibm1157.c ibm1157.h ibm1158.c ibm1158.h   \
-+            ibm803.c ibm803.h ibm901.c ibm901.h ibm902.c ibm902.h         \
-+            ibm921.c ibm921.h ibm1008.c ibm1008.h ibm1008_420.c           \
-+            ibm1097.c ibm1097.h ibm1112.c ibm1112.h ibm1123.c ibm1123.h   \
-+            ibm1130.c ibm1130.h ibm1140.c ibm1140.h ibm1141.c ibm1141.h   \
-+            ibm1142.c ibm1142.h ibm1143.c ibm1143.h ibm1144.c ibm1144.h   \
-+            ibm1145.c ibm1145.h ibm1146.c ibm1146.h ibm1147.c ibm1147.h   \
-+            ibm1148.c ibm1148.h ibm1149.c ibm1149.h ibm1166.c ibm1166.h   \
-+            ibm1167.c ibm1167.h ibm4517.c ibm4517.h ibm4899.c ibm4899.h   \
-+            ibm4909.c ibm4909.h ibm4971.c ibm4971.h ibm5347.c ibm5347.h   \
-+            ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h   \
-+            ibm12712.c ibm12712.h ibm16804.c ibm16804.h                   \
-+            ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h   \
-+            ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c   \
-+            brf.c mac-centraleurope.c hp-roman9.c hp-turkish8.c           \
-+            hp-thai8.c hp-greek8.c
-+
-+# We build the transformation modules only when we build shared libs.
-+ifeq (yes,$(build-shared))
-+
-+# Rule to generate the shared objects.
-+charmaps = ../localedata/charmaps
-+-include $(objpfx)iconv-rules
-+extra-modules-left := $(modules)
-+include extra-module.mk
-+
-+
-+extra-objs    += $(modules.so)
-+install-others        = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
-+                $(inst_gconvdir)/gconv-modules
-+
-+# We can build the conversion tables for numerous charsets automatically.
-+
-+gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \
-+                  ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr ebcdic-dk-no   \
-+                  ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a  \
-+                  ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \
-+                  ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \
-+                  ibm891 ibm903 ibm904 ibm905 ibm1047   \
-+
-+gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273           \
-+                      ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290   \
-+                      ibm297 ibm420 ibm424 ibm437 ibm850 ibm851 ibm852   \
-+                      ibm855 ibm857 ibm860 ibm861 ibm862 ibm863 ibm864   \
-+                      ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 ibm1004  \
-+                      ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 cp1254  \
-+                      cp1256 cp1257 ibm866 iso8859-5 iso8859-7 iso8859-8 \
-+                      iso8859-10 macintosh iec_p27-1 asmo_449            \
-+                      csn_369103 cwi dec-mcs ecma-cyrillic gost_19768-74 \
-+                      greek-ccitt greek7 greek7-old inis inis-8          \
-+                      inis-cyrillic iso_2033 iso_5427 iso_5427-ext       \
-+                      iso_5428 iso_10367-box mac-is nats-dano nats-sefi  \
-+                      iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
-+                      iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t    \
-+                      georgian-ps georgian-academy iso-ir-209 mac-sami   \
-+                      iso8859-11 ibm866nav pt154 rk1048 mik brf          \
-+                      mac-centraleurope koi8-ru hp-roman8 hp-roman9      \
-+                      ebcdic-es ebcdic-es-a ebcdic-is-friss ebcdic-uk    \
-+                      iso8859-16 viscii iso8859-9e hp-turkish8           \
-+                      hp-thai8 hp-greek8
-+
-+gen-special-modules := iso8859-7jp
-+
-+generated-modules := $(gen-8bit-modules) $(gen-8bit-gap-modules) \
-+                   $(gen-special-modules)
-+
-+generated = $(generated-modules:=.h) $(generated-modules:=.stmp) \
-+          iconv-test.out iconv-rules tst-loading.mtrace        \
-+          mtrace-tst-loading tst-tables.out iconv-test.xxx
-+ifdef objpfx
-+generated += gconv-modules
-+endif
-+
-+# Rules to generate the headers.
-+export AWK
-+
-+define generate-8bit-table
-+$(make-target-directory)
-+LC_ALL=C $(SHELL) ./gen-8bit.sh $< > $(@:stmp=T)
-+$(move-if-change) $(@:stmp=T) $(@:stmp=h)
-+touch $@
-+endef
-+
-+define generate-8bit-gap-table
-+$(make-target-directory)
-+LC_ALL=C $(SHELL) ./gen-8bit-gap.sh $< > $(@:stmp=T)
-+$(move-if-change) $(@:stmp=T) $(@:stmp=h)
-+touch $@
-+endef
-+
-+# The headers must be generated before the compilation.
-+before-compile = $(addprefix $(objpfx),$(generated-modules:=.h))
-+
-+ifndef avoid-generated
-+$(objpfx)iconv-rules: Makefile
-+      $(make-target-directory)
-+      { echo $(filter-out lib%, $(modules)); \
-+        echo 8bit $(gen-8bit-modules); \
-+        echo 8bit-gap $(gen-8bit-gap-modules); } | \
-+      $(AWK) 'NR == 1 { \
-+                for (i = 1; i <= NF; i++) { \
-+                  printf "%s-routines := %s\n", $$i, tolower($$i); \
-+                  printf "%s-map := gconv.map\n", $$i; \
-+                } \
-+              }; \
-+              NR > 1 { \
-+                for (i = 2; i <= NF; i++) { \
-+                  printf "$$(objpfx)%s.stmp: ", $$i; \
-+                  map = toupper($$i); \
-+                  sub(/^ISO8859/, "ISO-8859", map); \
-+                  if (map == "ISO_2033") map = map "-1983"; \
-+                  printf "$$(charmaps)/%s ", map; \
-+                  printf "gen-%s.sh\n", $$1; \
-+                  printf "\t$$(generate-%s-table)\n", $$1; \
-+                } \
-+              }' > $@.new
-+      mv -f $@.new $@
-+endif
-+
-+$(generated-modules:%=$(objpfx)%.h): $(objpfx)%.h: $(objpfx)%.stmp
-+      @:
-+
-+$(gen-8bit-modules:%=$(objpfx)%.stmp): $(objpfx)%.stmp: $(objpfx)iconv-rules
-+$(gen-8bit-gap-modules:%=$(objpfx)%.stmp): $(objpfx)%.stmp: $(objpfx)iconv-rules
-+
-+$(objpfx)iso8859-7jp.stmp: $(charmaps)/ISO-8859-7 gen-8bit-gap-1.sh
-+      $(make-target-directory)
-+      LC_ALL=C $(SHELL) ./gen-8bit-gap-1.sh $< > $(@:stmp=T)
-+      $(move-if-change) $(@:stmp=T) $(@:stmp=h)
-+      touch $@
-+
-+headers: $(addprefix $(objpfx), $(generated-modules:=.h))
-+
-+$(addprefix $(inst_gconvdir)/, $(modules.so)): \
-+    $(inst_gconvdir)/%: $(objpfx)% $(+force)
-+      $(do-install-program)
-+$(inst_gconvdir)/gconv-modules: gconv-modules $(+force)
-+      $(do-install)
-+ifeq (no,$(cross-compiling))
-+# Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
-+# if this libc has more gconv modules than the previously installed one.
-+      if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
-+         LC_ALL=C LANGUAGE=C \
-+         $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
-+         $(common-objpfx)iconv/iconvconfig \
-+           $(addprefix --prefix=,$(install_root)); \
-+      fi
-+else
-+      @echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
-+endif
-+
-+endif # build-shared = yes
-+
-+include ../Rules
-+
-+ifeq (no,$(cross-compiling))
-+ifeq (yes,$(build-shared))
-+tests: $(objpfx)iconv-test.out $(objpfx)tst-tables.out
-+ifneq (no,$(PERL))
-+tests: $(objpfx)mtrace-tst-loading
-+endif
-+endif
-+endif
-+
-+tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace
-+$(objpfx)mtrace-tst-loading: $(objpfx)tst-loading.out
-+      $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@
-+
-+$(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
-+                       $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \
-+                       $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)bug-iconv3: $(libdl)
-+$(objpfx)bug-iconv3.out: $(objpfx)gconv-modules \
-+                       $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)bug-iconv5.out: $(objpfx)gconv-modules \
-+                       $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)tst-loading.out: $(objpfx)gconv-modules \
-+                        $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
-+                       $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
-+                       $(addprefix $(objpfx),$(modules.so))
-+
-+$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
-+                       $(addprefix $(objpfx),$(modules.so)) \
-+                       $(common-objdir)/iconv/iconv_prog TESTS
-+      $(SHELL) -e $< $(common-objdir) > $@
-+
-+$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
-+                       $(addprefix $(objpfx),$(modules.so)) \
-+                       $(objpfx)tst-table-from $(objpfx)tst-table-to
-+      $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ > $@
-+
-+do-tests-clean common-mostlyclean: tst-tables-clean
-+
-+.PHONY: tst-tables-clean
-+tst-tables-clean:
-+      -rm -f $(objpfx)tst-*.table $(objpfx)tst-EUC-TW.irreversible
-+
-+ifdef objpfx
-+$(objpfx)gconv-modules: gconv-modules
-+      cp $^ $@
-+endif
 diff -Naur glibc-2.9.orig/include-native/bits/libc-tsd.h glibc-2.9/include-native/bits/libc-tsd.h
 --- glibc-2.9.orig/include-native/bits/libc-tsd.h      1969-12-31 19:00:00.000000000 -0500
 +++ glibc-2.9/include-native/bits/libc-tsd.h   2009-03-15 19:22:15.788787576 -0400
diff --git a/glibc/glibc-2.9-arm_setjmp_fix-1.patch b/glibc/glibc-2.9-arm_setjmp_fix-1.patch
deleted file mode 100644 (file)
index 9033dc6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2009-03-31
-Initial Package Version: 2.9
-Origin: http://sourceware.org/ml/libc-ports/2008-12/msg00011.html
-Upstream Status: Unknown
-Descrpition: All the other arm setjmp.S files provide a hidden alias for
-             __sigsetjmp. Without this the build fails.
-
-diff -Naur glibc-2.9.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.9/ports/sysdeps/arm/fpu/setjmp.S
---- glibc-2.9.orig/ports/sysdeps/arm/fpu/setjmp.S      2001-07-06 00:55:48.000000000 -0400
-+++ glibc-2.9/ports/sysdeps/arm/fpu/setjmp.S   2009-03-31 16:54:58.283164106 -0400
-@@ -33,3 +33,5 @@
-       /* Make a tail call to __sigjmp_save; it takes the same args.  */
-       B       PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
- END (__sigsetjmp)
-+
-+hidden_def (__sigsetjmp)
diff --git a/glibc/glibc-2.9-libgcc_eh-1.patch b/glibc/glibc-2.9-libgcc_eh-1.patch
deleted file mode 100644 (file)
index a4f0870..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2006-11-09
-Initial Package Version: 2.5
-Origin: Joe Ciccone
-Upstream Status: Unknown
-Description: Checks to see if libgcc_eh has been provided by gcc. If it has
-             the glibc will attempt to link to it.
-
-             Rediffed for 2.7 by Jim Gifford
-             Rediffed for 2.8 by Joe Ciccone
-             Rediffed for 2.9 by Joe Ciccone
-
-diff -Naur glibc-2.9.orig/config.make.in glibc-2.9/config.make.in
---- glibc-2.9.orig/config.make.in      2008-08-18 05:42:17.000000000 -0400
-+++ glibc-2.9/config.make.in   2008-12-17 08:23:59.000000000 -0500
-@@ -60,6 +60,7 @@
- have-libaudit = @have_libaudit@
- have-libcap = @have_libcap@
- have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
-+have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
- fno-unit-at-a-time = @fno_unit_at_a_time@
- bind-now = @bindnow@
- have-hash-style = @libc_cv_hashstyle@
-diff -Naur glibc-2.9.orig/configure.in glibc-2.9/configure.in
---- glibc-2.9.orig/configure.in        2008-11-27 19:05:05.000000000 -0500
-+++ glibc-2.9/configure.in     2008-12-17 08:21:56.000000000 -0500
-@@ -1394,6 +1394,23 @@
-     AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
-   fi
-+  AC_CACHE_CHECK(whether to link against libgcc_eh,
-+                 libc_cv_cc_with_libgcc_eh, [
-+    cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
-+       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
-+      libc_cv_cc_with_libgcc_eh=yes
-+    else
-+      libc_cv_cc_with_libgcc_eh=no
-+    fi
-+    rm -f conftest*])
-+  AC_SUBST(libc_cv_cc_with_libgcc_eh)
-+  if test $libc_cv_cc_with_libgcc_eh = yes; then
-+    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
-+  fi
-+
-   AC_CACHE_CHECK(for -z nodelete option,
-                libc_cv_z_nodelete, [dnl
-   cat > conftest.c <<EOF
-diff -Naur glibc-2.9.orig/configure glibc-2.9/configure
---- glibc-2.9.orig/configure   2008-11-27 19:05:36.000000000 -0500
-+++ glibc-2.9/configure        2008-12-17 08:24:21.000000000 -0500
-@@ -716,6 +716,7 @@
- BISON
- VERSIONING
- libc_cv_cc_with_libunwind
-+libc_cv_cc_with_libgcc_eh
- libc_cv_Bgroup
- libc_cv_libgcc_s_suffix
- libc_cv_as_needed
-@@ -6053,6 +6054,33 @@
-   fi
-+  { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
-+echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
-+if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
-+       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
-+      libc_cv_cc_with_libgcc_eh=yes
-+    else
-+      libc_cv_cc_with_libgcc_eh=no
-+    fi
-+    rm -f conftest*
-+fi
-+{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
-+echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; }
-+
-+  if test $libc_cv_cc_with_libgcc_eh = yes; then
-+    cat >>confdefs.h <<\_ACEOF
-+#define HAVE_CC_WITH_LIBGCC_EH 1
-+_ACEOF
-+
-+  fi
-+
-   { echo "$as_me:$LINENO: checking for -z nodelete option" >&5
- echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
- if test "${libc_cv_z_nodelete+set}" = set; then
-@@ -9282,6 +9310,7 @@
- BISON!$BISON$ac_delim
- VERSIONING!$VERSIONING$ac_delim
- libc_cv_cc_with_libunwind!$libc_cv_cc_with_libunwind$ac_delim
-+libc_cv_cc_with_libgcc_eh!$libc_cv_cc_with_libgcc_eh$ac_delim
- libc_cv_Bgroup!$libc_cv_Bgroup$ac_delim
- libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
- libc_cv_as_needed!$libc_cv_as_needed$ac_delim
-@@ -9335,7 +9364,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig
---- glibc-2.9.orig/Makeconfig  2008-08-18 05:42:17.000000000 -0400
-+++ glibc-2.9/Makeconfig       2008-12-17 08:23:42.000000000 -0500
-@@ -525,12 +525,20 @@
-   libunwind = -lunwind
- endif
- ifneq ($(have-as-needed),yes)
-- libgcc_eh := -lgcc_eh $(libunwind)
-+ ifneq ($(have-cc-with-libgcc_eh),yes)
-+  libgcc_eh := $(libunwind)
-+ else
-+  libgcc_eh := -lgcc_eh $(libunwind)
-+ endif
- else
-  libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
- endif
- gnulib := -lgcc $(libgcc_eh)
--static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+ifneq ($(have-cc-with-libgcc_eh),yes)
-+ static-gnulib := -lgcc $(libunwind)
-+else
-+ static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+endif
- libc.so-gnulib := -lgcc
- endif
- ifeq ($(elf),yes)
diff --git a/glibc/glibc-2.9-localedef_segfault-1.patch b/glibc/glibc-2.9-localedef_segfault-1.patch
deleted file mode 100644 (file)
index d5d5840..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2007-05-19
-Initial Package Version: 2.6
-Origin: Debian
-Upstream Status: Unknown
-Description: Fixes Segfault when using localdef.
-             This problem is only noticed when using PaX
-             and some architectures besides x86.
-             See debian bug # 231438
-
-             Rediffed for 2.8 by Joe Ciccone
-             Rediffed for 2.9 by Joe Ciccone
-
-diff -Naur glibc-2.8.orig/locale/programs/3level.h glibc-2.8/locale/programs/3level.h
---- glibc-2.8.orig/locale/programs/3level.h    2007-07-15 20:54:59.000000000 -0400
-+++ glibc-2.8/locale/programs/3level.h 2008-09-20 12:09:34.000000000 -0400
-@@ -203,6 +203,42 @@
-       }
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do                                                                          \
-+  {                                                                         \
-+    struct wchead_table *t = (tp);                                          \
-+    uint32_t index1;                                                        \
-+    for (index1 = 0; index1 < t->level1_size; index1++)                             \
-+      {                                                                             \
-+      uint32_t lookup1 = t->level1[index1];                                 \
-+      if (lookup1 != ((uint32_t) ~0))                                       \
-+        {                                                                   \
-+          uint32_t lookup1_shifted = lookup1 << t->q;                       \
-+          uint32_t index2;                                                  \
-+          for (index2 = 0; index2 < (1 << t->q); index2++)                  \
-+            {                                                               \
-+              uint32_t lookup2 = t->level2[index2 + lookup1_shifted];       \
-+              if (lookup2 != ((uint32_t) ~0))                               \
-+                {                                                           \
-+                  uint32_t lookup2_shifted = lookup2 << t->p;               \
-+                  uint32_t index3;                                          \
-+                  for (index3 = 0; index3 < (1 << t->p); index3++)          \
-+                    {                                                       \
-+                      struct element_t *lookup3                             \
-+                        = t->level3[index3 + lookup2_shifted];              \
-+                      if (lookup3 != NULL)                                  \
-+                        fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+                            lookup3);                                       \
-+                    }                                                       \
-+                }                                                           \
-+            }                                                               \
-+        }                                                                   \
-+      }                                                                             \
-+  } while (0)
-+
- #endif
- #ifndef NO_FINALIZE
diff --git a/glibc/glibc-2.9-nptl_lowlevellock-1.patch b/glibc/glibc-2.9-nptl_lowlevellock-1.patch
deleted file mode 100644 (file)
index c28513c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2009-01-03
-Initial Package Version: 2.8
-Origin: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.8/6240_all_glibc-2.8-nptl-lowlevellock.patch?rev=1.1&view=markup
-Upstream Status: Unknown
-Description: Adds a missing include to arm that fixes a compilation problem.
-
-diff -Naur glibc-2.8.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.8/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.8.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h       2007-09-12 08:57:25.000000000 -0400
-+++ glibc-2.8/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h    2009-01-03 18:12:10.042527536 -0500
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>
- #define FUTEX_WAIT            0
- #define FUTEX_WAKE            1