diff options
84 files changed, 88 insertions, 11 deletions
@@ -677,7 +677,7 @@ fi if test -n "$libgd_include"; then config_vars="$config_vars -CFLAGS-memprofstat.c = $libgd_include" +CFLAGS-memusagestat.c = $libgd_include" fi if test -n "$libgd_ldflags"; then config_vars="$config_vars diff --git a/configure.in b/configure.in index 13ed632a7f..4073ff190e 100644 --- a/configure.in +++ b/configure.in @@ -61,7 +61,7 @@ esac if test -n "$libgd_include"; then config_vars="$config_vars -CFLAGS-memprofstat.c = $libgd_include" +CFLAGS-memusagestat.c = $libgd_include" fi if test -n "$libgd_ldflags"; then config_vars="$config_vars diff --git a/crypt/Makefile b/crypt/Makefile index 0692c2647c..532853069b 100644 --- a/crypt/Makefile +++ b/crypt/Makefile @@ -45,17 +45,15 @@ $(objpfx)md5test: $(objpfx)md5.o include ../Rules -LDLIBS-cert = libcrypt -LDLIBS-md5c-test = libcrypt - ifeq (yes,$(build-shared)) libcrypt-dep = $(objpfx)libcrypt.so else libcrypt-dep = $(objpfx)libcrypt.a endif -$(objpfx)cert.out: $(libcrypt-dep) -$(objpfx)md5c-test.out: $(libcrypt-dep) +$(objpfx)cert: $(libcrypt-dep) +$(objpfx)md5c-test: $(libcrypt-dep) + # Depend on libc.so so a DT_NEEDED is generated in the shared objects. # This ensures they will load libc.so for needed symbols if loaded by diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA index c53d803779..fd101f58d9 100644 --- a/localedata/locales/af_ZA +++ b/localedata/locales/af_ZA @@ -2238,6 +2238,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0032><U0037>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA index 4f2d7aa10d..751d326f3d 100644 --- a/localedata/locales/ar_SA +++ b/localedata/locales/ar_SA @@ -559,6 +559,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0039><U0036><U0036>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY index 45a3470090..954d7e25bc 100644 --- a/localedata/locales/be_BY +++ b/localedata/locales/be_BY @@ -3120,6 +3120,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0037><U0035>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG index aaabc4698d..1c53a1a3cd 100644 --- a/localedata/locales/bg_BG +++ b/localedata/locales/bg_BG @@ -3143,6 +3143,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0035><U0039>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES index 0eb42b6a32..36be1c9938 100644 --- a/localedata/locales/ca_ES +++ b/localedata/locales/ca_ES @@ -2190,6 +2190,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK index 4d6185bc6e..be609c0a06 100644 --- a/localedata/locales/da_DK +++ b/localedata/locales/da_DK @@ -2213,6 +2213,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0035>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE index 5750d76795..c125df0dcb 100644 --- a/localedata/locales/de_BE +++ b/localedata/locales/de_BE @@ -128,6 +128,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH index 6f2a17eea9..b463431f34 100644 --- a/localedata/locales/de_CH +++ b/localedata/locales/de_CH @@ -128,6 +128,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU index ca2ddff696..745770a970 100644 --- a/localedata/locales/de_LU +++ b/localedata/locales/de_LU @@ -128,6 +128,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0035><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR index 2ca321e5ba..402ca6a2ad 100644 --- a/localedata/locales/el_GR +++ b/localedata/locales/el_GR @@ -3156,6 +3156,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0030>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU index 1e14a81bd9..565bfc4d2f 100644 --- a/localedata/locales/en_AU +++ b/localedata/locales/en_AU @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0036><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW index abb10ba172..2ef9248ade 100644 --- a/localedata/locales/en_BW +++ b/localedata/locales/en_BW @@ -91,6 +91,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0032><U0036><U0037>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA index 46b29f5653..1f9c3da404 100644 --- a/localedata/locales/en_CA +++ b/localedata/locales/en_CA @@ -2193,6 +2193,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_CA,2.5 b/localedata/locales/en_CA,2.5 index 4e8ae81a0b..bc705e497b 100644 --- a/localedata/locales/en_CA,2.5 +++ b/localedata/locales/en_CA,2.5 @@ -823,6 +823,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK index be04ede069..8ffbc8ceea 100644 --- a/localedata/locales/en_DK +++ b/localedata/locales/en_DK @@ -136,6 +136,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0035>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE index e757b29bb1..1edff35041 100644 --- a/localedata/locales/en_IE +++ b/localedata/locales/en_IE @@ -131,6 +131,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0035><U0033>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ index 778b8b773c..26771220ea 100644 --- a/localedata/locales/en_NZ +++ b/localedata/locales/en_NZ @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0036><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA index cfeff026ec..51c8ad2613 100644 --- a/localedata/locales/en_ZA +++ b/localedata/locales/en_ZA @@ -127,6 +127,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0032><U0037>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW index ef7404ffb0..2466d7b1c1 100644 --- a/localedata/locales/en_ZW +++ b/localedata/locales/en_ZW @@ -91,6 +91,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0032><U0036><U0033>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR index 4dcfd8b9fa..4d045210d3 100644 --- a/localedata/locales/es_AR +++ b/localedata/locales/es_AR @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO index e08a73f617..0a752c81d9 100644 --- a/localedata/locales/es_BO +++ b/localedata/locales/es_BO @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0039><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL index f0d795ef2b..c482eae58b 100644 --- a/localedata/locales/es_CL +++ b/localedata/locales/es_CL @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0036>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO index a6e91be43d..29015b81a2 100644 --- a/localedata/locales/es_CO +++ b/localedata/locales/es_CO @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0037>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO index 4fda017766..423492d137 100644 --- a/localedata/locales/es_DO +++ b/localedata/locales/es_DO @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0031><U0038><U0030><U0039>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC index 16fba0dc28..746990489a 100644 --- a/localedata/locales/es_EC +++ b/localedata/locales/es_EC @@ -2208,6 +2208,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0039><U0033>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES index ea3b162c89..8e48828025 100644 --- a/localedata/locales/es_ES +++ b/localedata/locales/es_ES @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT index 320d2237a2..b155e419b0 100644 --- a/localedata/locales/es_GT +++ b/localedata/locales/es_GT @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0030><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN index 4731f55974..281767baad 100644 --- a/localedata/locales/es_HN +++ b/localedata/locales/es_HN @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0030><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX index 18a6265ac9..2ddaedb1d6 100644 --- a/localedata/locales/es_MX +++ b/localedata/locales/es_MX @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA index 19236d2e71..346b86c551 100644 --- a/localedata/locales/es_PA +++ b/localedata/locales/es_PA @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0030><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE index d57ed36d6d..2f3e6edb8f 100644 --- a/localedata/locales/es_PE +++ b/localedata/locales/es_PE @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY index 1af0e73238..9b11136fe5 100644 --- a/localedata/locales/es_PY +++ b/localedata/locales/es_PY @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0039><U0035>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV index bce7039d4f..d4f2b66536 100644 --- a/localedata/locales/es_SV +++ b/localedata/locales/es_SV @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0030><U0033>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_US b/localedata/locales/es_US index f3bc70b076..6e99da93a3 100644 --- a/localedata/locales/es_US +++ b/localedata/locales/es_US @@ -2206,6 +2206,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY index 40cb536aa7..771f42f8d9 100644 --- a/localedata/locales/es_UY +++ b/localedata/locales/es_UY @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0039><U0038>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE index a9bc4dace9..0d76d0a856 100644 --- a/localedata/locales/es_VE +++ b/localedata/locales/es_VE @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0038>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE index fe5e05098b..7752e2e3d2 100644 --- a/localedata/locales/et_EE +++ b/localedata/locales/et_EE @@ -2206,6 +2206,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0037><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES index f9b6db30d1..0ee4d508fb 100644 --- a/localedata/locales/eu_ES +++ b/localedata/locales/eu_ES @@ -137,6 +137,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR index c3f44975fa..b53f8663c6 100644 --- a/localedata/locales/fa_IR +++ b/localedata/locales/fa_IR @@ -546,6 +546,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0039><U0038>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI index b724bb0d2e..81884e5bfe 100644 --- a/localedata/locales/fi_FI +++ b/localedata/locales/fi_FI @@ -2201,6 +2201,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0035><U0038>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO index 6589462593..23d457910c 100644 --- a/localedata/locales/fo_FO +++ b/localedata/locales/fo_FO @@ -117,6 +117,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0032><U0039><U0038>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE index 7ad2d1c3e1..9ac31a491b 100644 --- a/localedata/locales/fr_BE +++ b/localedata/locales/fr_BE @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA index 2641ffc3d0..0fc2190eb7 100644 --- a/localedata/locales/fr_CA +++ b/localedata/locales/fr_CA @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/fr_CA,2.13 b/localedata/locales/fr_CA,2.13 index 38d32b1194..942b943e27 100644 --- a/localedata/locales/fr_CA,2.13 +++ b/localedata/locales/fr_CA,2.13 @@ -864,6 +864,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH index 60e77ca320..95a29fff05 100644 --- a/localedata/locales/fr_CH +++ b/localedata/locales/fr_CH @@ -116,6 +116,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU index a4fb618058..8b86ea5894 100644 --- a/localedata/locales/fr_LU +++ b/localedata/locales/fr_LU @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0035><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE index b298dbf291..7ba996c84a 100644 --- a/localedata/locales/ga_IE +++ b/localedata/locales/ga_IE @@ -128,6 +128,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0035><U0033>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES index 665035cf85..09682b8a30 100644 --- a/localedata/locales/gl_ES +++ b/localedata/locales/gl_ES @@ -131,6 +131,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB index a9ece7b3a1..212944a0b7 100644 --- a/localedata/locales/gv_GB +++ b/localedata/locales/gv_GB @@ -141,6 +141,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL index dfdd4ce6f9..e46c006ef0 100644 --- a/localedata/locales/he_IL +++ b/localedata/locales/he_IL @@ -129,6 +129,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0039><U0037><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR index 8cd3b8c188..252383f45a 100644 --- a/localedata/locales/hr_HR +++ b/localedata/locales/hr_HR @@ -2217,6 +2217,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0038><U0035>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU index 29ed60464c..4adff1de63 100644 --- a/localedata/locales/hu_HU +++ b/localedata/locales/hu_HU @@ -2294,6 +2294,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0036>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/id_ID b/localedata/locales/id_ID index 2fb3b2035f..a1b630c68b 100644 --- a/localedata/locales/id_ID +++ b/localedata/locales/id_ID @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0036><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/in_ID b/localedata/locales/in_ID index 8ae73c691c..47d3effc35 100644 --- a/localedata/locales/in_ID +++ b/localedata/locales/in_ID @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0036><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS index 0d5be29841..61f50c6f2c 100644 --- a/localedata/locales/is_IS +++ b/localedata/locales/is_IS @@ -2236,6 +2236,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0035><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH index 8500959533..fd68e23073 100644 --- a/localedata/locales/it_CH +++ b/localedata/locales/it_CH @@ -109,6 +109,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT index f96d6dba3f..103e4b175c 100644 --- a/localedata/locales/it_IT +++ b/localedata/locales/it_IT @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0039>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/iw_IL b/localedata/locales/iw_IL index 3da92c9923..42c781ffed 100644 --- a/localedata/locales/iw_IL +++ b/localedata/locales/iw_IL @@ -129,6 +129,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0039><U0037><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL index dea746f2f5..ac28aba281 100644 --- a/localedata/locales/kl_GL +++ b/localedata/locales/kl_GL @@ -118,6 +118,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0032><U0039><U0039>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR index dfe39bdde6..a83533878f 100644 --- a/localedata/locales/ko_KR +++ b/localedata/locales/ko_KR @@ -1795,6 +1795,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0038><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB index f693ccac7c..4a271da2b0 100644 --- a/localedata/locales/kw_GB +++ b/localedata/locales/kw_GB @@ -133,6 +133,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0034>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT index 2016ebbaf1..9f88e78d55 100644 --- a/localedata/locales/lt_LT +++ b/localedata/locales/lt_LT @@ -2201,6 +2201,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0037><U0030>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV index 96bb4df0d6..db21f1df54 100644 --- a/localedata/locales/lv_LV +++ b/localedata/locales/lv_LV @@ -2194,6 +2194,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0037><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK index 665c9605a7..d32afa7625 100644 --- a/localedata/locales/mk_MK +++ b/localedata/locales/mk_MK @@ -3096,6 +3096,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0038><U0039>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE index 9a3d4eb0c5..b01d21744c 100644 --- a/localedata/locales/nl_BE +++ b/localedata/locales/nl_BE @@ -113,6 +113,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0032>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL index a000cadc07..4975a551ac 100644 --- a/localedata/locales/nl_NL +++ b/localedata/locales/nl_NL @@ -129,6 +129,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL index 972fa64b4b..8445992b6c 100644 --- a/localedata/locales/pl_PL +++ b/localedata/locales/pl_PL @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0038>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR index 9a2b597411..248fea592b 100644 --- a/localedata/locales/pt_BR +++ b/localedata/locales/pt_BR @@ -130,6 +130,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0035><U0035>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO index bb5bc4943c..973cf0f8ff 100644 --- a/localedata/locales/ro_RO +++ b/localedata/locales/ro_RO @@ -2190,6 +2190,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0030>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU index fec6585a8a..7579c70d10 100644 --- a/localedata/locales/ru_RU +++ b/localedata/locales/ru_RU @@ -3125,6 +3125,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0037>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA index e5cd89f1a0..b2a8365c4e 100644 --- a/localedata/locales/ru_UA +++ b/localedata/locales/ru_UA @@ -3120,6 +3120,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0038><U0030>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK index e476aa04b2..c53a12d6c4 100644 --- a/localedata/locales/sk_SK +++ b/localedata/locales/sk_SK @@ -190,6 +190,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0034><U0032><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI index e0c9796c2c..77773af501 100644 --- a/localedata/locales/sl_SI +++ b/localedata/locales/sl_SI @@ -2192,6 +2192,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0038><U0036>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/sr_YU b/localedata/locales/sr_YU index 894a7ad3a0..ca795ccae9 100644 --- a/localedata/locales/sr_YU +++ b/localedata/locales/sr_YU @@ -2217,6 +2217,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0038><U0031>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI index 0241f0c227..33d6d95512 100644 --- a/localedata/locales/sv_FI +++ b/localedata/locales/sv_FI @@ -114,6 +114,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0035><U0038>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH index 1147838c5c..8624cfa1bf 100644 --- a/localedata/locales/th_TH +++ b/localedata/locales/th_TH @@ -1047,6 +1047,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0036><U0036>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR index cae0db0bd6..739f95c1df 100644 --- a/localedata/locales/tr_TR +++ b/localedata/locales/tr_TR @@ -3110,6 +3110,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0039><U0030>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA index a328584d9c..560c115008 100644 --- a/localedata/locales/uk_UA +++ b/localedata/locales/uk_UA @@ -3120,6 +3120,7 @@ END LC_PAPER LC_TELEPHONE tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ <U006C>" +int_prefix "<U0033><U0038><U0030>" END LC_TELEPHONE LC_MEASUREMENT diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index e771676f0f..cd91addda5 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -396,7 +396,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, *reloc_addr = value; break; case R_SPARC_JMP_SLOT: - elf_machine_fixup_plt(map, NULL, reloc, reloc_addr, value); + elf_machine_fixup_plt(map, 0, reloc, reloc_addr, value); break; case R_SPARC_8: *(char *) reloc_addr = value; diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 35efc8e9f1..fc89f08ed2 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -313,7 +313,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, break; case R_SPARC_JMP_SLOT: - elf_machine_fixup_plt(map, NULL, reloc, reloc_addr, value); + elf_machine_fixup_plt(map, 0, reloc, reloc_addr, value); break; case R_SPARC_UA64: diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c b/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c index 6a77e28a8a..1218f9dae0 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c @@ -48,8 +48,9 @@ __mmap64 (__ptr_t addr, size_t len, int prot, int flags, int fd, off64_t offset) int saved_errno = errno; #endif /* This will be always 12, no matter what page size is. */ - __ptr_t result = INLINE_SYSCALL (mmap2, 6, addr, len, prot, flags, - fd, (off_t) (offset >> 12)); + __ptr_t result = + (__ptr_t) INLINE_SYSCALL (mmap2, 6, addr, len, prot, flags, + fd, (off_t) (offset >> 12)); #ifndef __ASSUME_MMAP2_SYSCALL if (result != (__ptr_t) -1 || errno != ENOSYS) |