Commit Graph

31771 Commits

Author SHA1 Message Date
Matthew Krupcale
3adfef7eaa nptl: Fix typo on __have_pthread_attr_t (BZ#21715)
This patch fixes some build issues when including types/sigevent_t.h
along with bits/pthreadtypes.h.

Checked on x86_64-linux-gnu and on a build on supported major ABIs.

	[BZ #21715]
	* sysdeps/nptl/bits/pthreadtypes.h (__have_pthread_attr_t): Fix typo
	on definition.
2017-07-06 10:27:24 -03:00
H.J. Lu
031e519c95 x86-64: Align the stack in __tls_get_addr [BZ #21609]
This change forces realignment of the stack pointer in __tls_get_addr, so
that binaries compiled by GCCs older than GCC 4.9:

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066

continue to work even if vector instructions are used in glibc which
require the ABI stack realignment.

__tls_get_addr_slow is added to handle the slow paths in the default
implementation of__tls_get_addr in elf/dl-tls.c.  The new __tls_get_addr
calls __tls_get_addr_slow after realigning the stack.  Internal calls
within ld.so go directly to the default implementation of __tls_get_addr
because they do not need stack realignment.

	[BZ #21609]
	* sysdeps/x86_64/Makefile (sysdep-dl-routines): Add tls_get_addr.
	(gen-as-const-headers): Add rtld-offsets.sym.
	* sysdeps/x86_64/dl-tls.c: New file.
	* sysdeps/x86_64/rtld-offsets.sym: Likwise.
	* sysdeps/x86_64/tls_get_addr.S: Likewise.
	* sysdeps/x86_64/dl-tls.h: Add multiple inclusion guards.
	* sysdeps/x86_64/tlsdesc.sym (TI_MODULE_OFFSET): New.
	(TI_OFFSET_OFFSET): Likwise.
2017-07-06 04:43:20 -07:00
Akhilesh Kumar
0cae0b1a28 Pashto yesstr/nostr locale are missing
[BZ #21711]
During Locale verification I observed that

yesstr and nostr are missing for Pashto [LC_MESSAGES] Locale

For Afghanistan reference google translate and Pashto travel book.
2017-07-06 09:34:58 +02:00
Adhemerval Zanella
db6b2f2522 posix: Fix default posix_spawn return value
This patch fix the return value for error conditions for default
posix_spawn (where the errno is expected).  It also avoid clobber
errno on fork call.

Checked on x86_64 (with Linux implementation removed).

	[BZ# 21697]
	* sysdeps/posix/spawni.c (__spawni_child): Fix return value.
	(__spawnix): Do not clober errno.
2017-07-05 15:58:31 -03:00
Carlos O'Donell
b8e0e03b7c Fixup localedata/ChangeLog.
- Rewrite recent entry to follow GNU ChangeLog format.
- Convert spaces to tabs in one case.
2017-07-05 14:14:44 -04:00
Joseph Myers
8d6cba414a Edit and shorten float128 NEWS item. 2017-07-05 17:44:26 +00:00
Florian Weimer
cb3c27e87b support: Add resolver testing mode which does not patch _res 2017-07-05 19:04:40 +02:00
Florian Weimer
d4165eedf5 support: Add support_chroot_create and support_chroot_free 2017-07-05 19:04:40 +02:00
Florian Weimer
76637a921f support: Check isolation of loopback addresses in tst-support-namespace 2017-07-05 19:04:39 +02:00
Akhilesh Kumar
97e7b6aa42 Added Tok-Pisin locale.
[BZ #21694]
Added tok-pisin language locale for Papua New Guinea.

Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com>
2017-07-05 18:40:08 +02:00
Joseph Myers
7e368000c0 Consistently say "GNU C Library" in NEWS, not "glibc". 2017-07-05 13:46:57 +00:00
Zack Weinberg
2b2ccd0c63 Reorganize and revise NEWS for 2.26. 2017-07-05 09:03:00 -04:00
Akhilesh Kumar
cc31b141f9 For Breton yesstr/nostr locale are missing
[BZ #21706]
During Locale verification i observed that
yesstr and nostr  are missing for Breton [LC_MESSAGES] locale

Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com>
2017-07-04 17:25:52 +02:00
Szabolcs Nagy
d2e0491883 Single threaded stdio optimization
Locking overhead can be significant in some stdio operations
that are common in single threaded applications.

This patch adds the _IO_FLAGS2_NEED_LOCK flag to indicate if
an _IO_FILE object needs to be locked and some of the stdio
functions just jump to their _unlocked variant when not.  The
flag is set on all _IO_FILE objects when the first thread is
created.  A new GLIBC_PRIVATE libc symbol, _IO_enable_locks,
was added to do this from libpthread.

The optimization can be applied to more stdio functions,
currently it is only applied to single flag check or single
non-wide-char standard operations.  The flag should probably
be never set for files with _IO_USER_LOCK, but that's just a
further optimization, not a correctness requirement.

The optimization is valid in a single thread because stdio
operations are non-as-safe (so lock state is not observable
from a signal handler) and stdio locks are recursive (so lock
state is not observable via deadlock).  The optimization is not
valid if a thread may be created while an stdio lock is taken
and thus it should be disabled if any user code may run during
an stdio operation (interposed malloc, printf hooks, etc).
This makes the optimization more complicated for some stdio
operations (e.g. printf), but those are bigger and thus less
important to optimize so this patch does not try to do that.

	* libio/libio.h (_IO_FLAGS2_NEED_LOCK, _IO_need_lock): Define.
	* libio/libioP.h (_IO_enable_locks): Declare.
	* libio/Versions (_IO_enable_locks): New symbol.
	* libio/genops.c (_IO_enable_locks): Define.
	(_IO_old_init): Initialize flags2.
	* libio/feof.c.c (_IO_feof): Avoid locking when not needed.
	* libio/ferror.c (_IO_ferror): Likewise.
	* libio/fputc.c (fputc): Likewise.
	* libio/putc.c (_IO_putc): Likewise.
	* libio/getc.c (_IO_getc): Likewise.
	* libio/getchar.c (getchar): Likewise.
	* libio/ioungetc.c (_IO_ungetc): Likewise.
	* nptl/pthread_create.c (__pthread_create_2_1): Enable stdio locks.
	* libio/iofopncook.c (_IO_fopencookie): Enable locking for the file.
	* sysdeps/pthread/flockfile.c (__flockfile): Likewise.
2017-07-04 16:05:12 +01:00
Florian Weimer
1ff6c67a25 sysconf: Use conservative default for _SC_NPROCESSORS_ONLN [BZ #21542] 2017-07-04 16:12:46 +02:00
Florian Weimer
4446a885f3 resolv: Fix resolv_conf _res matching
A dot-less host name without an /etc/resolv.conf file caused an
assertion failure in update_from_conf because the function would not
deal correctly with the empty search list case.

Thanks to Andreas Schwab for debugging assistence.
2017-07-04 15:26:05 +02:00
Joseph Myers
f0107724c9 Update versions in build-many-glibcs.py.
This patch updates build-many-glibcs.py to use the current release
branch of binutils and current releases of GMP and the Linux kernel.

	* scripts/build-many-glibcs.py (Context.checkout): Default
	binutils version to 2.29 branch, GMP version to 6.1.2 and Linux
	kernel version to 4.12.
2017-07-04 10:32:54 +00:00
Florian Weimer
89f6307c5d resolv: Fix improper assert in __resolv_conf_attach 2017-07-04 11:18:34 +02:00
Florian Weimer
e237357a5a resolv: Introduce free list for resolv_conf index slosts 2017-07-03 21:07:11 +02:00
Florian Weimer
aef16cc8a4 resolv: Automatically reload a changed /etc/resolv.conf file [BZ #984]
This commit enhances the stub resolver to reload the configuration
in the per-thread _res object if the /etc/resolv.conf file has
changed.  The resolver checks whether the application has modified
_res and will not overwrite the _res object in that case.

The struct resolv_context mechanism is used to check the
configuration file only once per name lookup.
2017-07-03 21:06:23 +02:00
Florian Weimer
a1c4eb8794 resolv: Mirror the entire resolver configuration in struct resolv_conf
This commit adds the remaining unchanging members (which are loaded
from /etc/resolv.conf) to struct resolv_conf.

The extended name server list is currently not used by the stub
resolver.  The switch depends on a cleanup: The _u._ext.nssocks
array stores just a single socket, and needs to be replaced with
a single socket value.

(The compatibility gethostname implementation does not use the
extended addres sort list, either.  Updating the compat code is
not worthwhile.)
2017-07-03 21:03:21 +02:00
Florian Weimer
3f853f22c8 resolv: Lift domain search list limits [BZ #19569] [BZ #21475]
This change uses the extended resolver state in struct resolv_conf to
store the search list.  If applications have not patched the _res
object directly, this extended search list will be used by the stub
resolver during name resolution.
2017-07-03 21:01:42 +02:00
Florian Weimer
f30a54b21b resolv: Introduce struct resolv_conf with extended resolver state
This change provides additional resolver configuration state which
is not exposed through the _res ABI.  It reuses the existing
initstamp field in the supposedly-private part of _res.  Some effort
is undertaken to avoid memory safety issues introduced by applications
which directly patch the _res object.

With this commit, only the initstamp field is moved into struct
resolv_conf.  Additional members will be added later, eventually
migrating the entire resolver configuration.
2017-07-03 20:57:28 +02:00
Florian Weimer
352f4ff9a2 resolv: Introduce struct resolv_context [BZ #21668]
struct resolv_context objects provide a temporary resolver context
which does not change during a name lookup operation.  Only when the
outmost context is created, the stub resolver configuration is
verified to be current (at present, only against previous res_init
calls).  Subsequent attempts to obtain the context will reuse the
result of the initial verification operation.

struct resolv_context can also be extended in the future to store
data which needs to be deallocated during thread cancellation.
2017-07-03 20:52:59 +02:00
Florian Weimer
4e45d83c92 resolv: Add preinit tests to resolv/tst-resolv-res_init-skeleton.c 2017-07-03 17:54:48 +02:00
Rafal Luzynski
073ec86e5e More fixes after the recent import from CLDR-31
After the recent import of month names from CLDR (bug 21217) more
imports are also needed, mostly abbreviated month names.

	* localedata/locales/br_FR (abmon): Reworded "Eve " to "Mezh".

	* localedata/locales/fy_NL (abmon): Reworded "Maa" (March) to
	"Mrt" and "Maa" (May) to "Mai".

	* localedata/locales/lg_UG (abmon): Reworded "Jun" to "Juu".

	* localedata/locales/ln_CD (abmon): "yan", "fbl", "msi",
	and so on.

	* localedata/locales/mn_MN (abmon): "1-р сар", "2-р сар",
	"3-р сар", and so on.

	* localedata/locales/vi_VN (abmon): Reworded "Th01" to "Thg 1",
	"Th02" to "Thg 2" and so on.

	* localedata/locales/yo_NG (abday): "Àìkú", "Ajé", "Ìsẹ́gun",
	and so on, also comment updated to match the new content.
	(day): "Ọjọ́ Àìkú", "Ọjọ́ Ajé", "Ọjọ́ Ìsẹ́gun", and so on.
	(abmon): "Ṣẹ́rẹ́", "Èrèlè", "Ẹrẹ̀nà", and so on.
	(mon): Comment updated to match the actual content.
	(d_t_fmt): Changed "%A" to "%a" and "%B" to "%b".

	* localedata/locales/zu_ZA (abmon): "Jan", "Feb", "Mas",
	and so on, also comment updated to match the new content.
	(mon): comment updated to match the actual content.
2017-07-03 09:10:12 +02:00
Rajalakshmi Srinivasaraghavan
2572f356b1 powerpc: Clean up strlen and strnlen for power8
To align a quadword aligned address to 64 bytes, maximum of three
16 bytes load is needed for worst case instead of loading four times.
2017-07-03 10:46:13 +05:30
H.J. Lu
8dc6133eff Use __builtin_popcount in __sched_cpucount [BZ #21696]
posix/sched_cpucount.c assumes that size of __cpu_mask == size of long,
which is incorrect for x32.  This patch uses __builtin_popcount, which
is availabe in GCC 4.9, in posix/sched_cpucount.c.

Tested on i686, x86-64 and x32 with multi-arch disabled.

	[BZ #21696]
	* posix/sched_cpucount.c: Don't include <limits.h>.
	(__sched_cpucount): Use __builtin_popcount.
2017-07-01 07:29:32 -07:00
Siddhesh Poyarekar
47ea614b9a Fix typo in glibc.tune.cpu name 2017-07-01 19:51:44 +05:30
Gabriel F. T. Gomes
8466ee1cb7 float128: Add signbit alternative for old compilers
In math/math.h, __MATH_TG will expand signbit to __builtin_signbit*,
e.g.: __builtin_signbitf128, before GCC 6.  However, there has never
been a __builtin_signbitf128 in GCC and the type-generic builtin is
only available since GCC 6.  For older GCC, this patch defines
__builtin_signbitf128 to __signbitf128, so that the internal function
is used instead of the non-existent builtin.

This patch also changes the implementation of __signbitf128, because
it was reusing the implementation of __signbitl from ldbl-128, which
calls __builtin_signbitl.  Using the long double version of the
builtin is not correct on machines where _Float128 is ABI-distinct
from long double (i.e.: ia64, powerpc64le, x86, x86_84).  The new
implementation does not rely on builtins when being built with GCC
versions older than 6.0.

The new code does not currently affect powerpc64le builds, because
only GCC 6.2 fulfills the requirements from configure.  It might
affect powerpc64le builds if those requirements are backported to
older versions of the compiler.  The new code affects x86_64 builds,
since glibc is supposed to build correctly with older versions of GCC.

Tested for powerpc64le and x86_64.

	* include/math.h (__signbitf128): Define as hidden.
	* sysdeps/ieee754/float128/s_signbitf128.c (__signbitf128):
	Reimplement without builtins.
	* sysdeps/ia64/bits/floatn.h [!__GNUC_PREREQ (6, 0)]
	(__builtin_signbitf128): Define to __signbitf128.
	* sysdeps/powerpc/bits/floatn.h: Likewise.
	* sysdeps/x86/bits/floatn.h: Likewise.
2017-06-30 18:34:29 -03:00
Adhemerval Zanella
9b8f8593e5 Consolidate Linux fcntl implementation
This patch consolidates the fcntl Linux syscall generation on
sysdeps/unix/sysv/linux/fcntl.c.  It basically removes all the
architecture specific implementations.

Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
aarch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.

	* sysdeps/unix/sysv/linux/arm/fcntl.c: Remove file.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/hppa/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/m68k/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/microblaze/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips32/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/n32/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/sh/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/fcntl.c: New file.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: Refactor to
	use default implementation.
2017-06-30 15:17:26 -03:00
Siddhesh Poyarekar
28cfa3a48e tunables, aarch64: New tunable to override cpu
Add a new tunable (glibc.tune.cpu) to override CPU identification on
aarch64.  This is useful in two cases: one where it is desirable to
pretend to be another CPU for purposes of testing or because routines
written for that CPU are beneficial for specific workloads and second
where the underlying kernel does not support emulation of MRS to get
the MIDR of the CPU.

	* elf/dl-tunables.h (tunable_is_name): Move from...
	* elf/dl-tunables.c (is_name): ... here.
	(parse_tunables, __tunables_init): Adjust.
	* manual/tunables.texi: Document glibc.tune.cpu.
	* sysdeps/aarch64/dl-tunables.list: New file.
	* sysdeps/unix/sysv/linux/aarch64/cpu-features.c (struct
	cpu_list): New type.
	(cpu_list): New list of CPU names and their MIDR.
	(get_midr_from_mcpu): New function.
	(init_cpu_features): Override MIDR if necessary.
2017-06-30 22:58:39 +05:30
Siddhesh Poyarekar
ab85da1530 aarch64: Call all string function implementations in tests
The string function implementations implemented so far do not use any
instructions that may deviate from standard aarch64, so it is possible
for all routines to run on all armv8 hardware.  Select all
implementations in the benchmarks and tests.

	* sysdeps/aarch64/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Unconditionally select thunderx
	routine for testing.
2017-06-30 22:57:12 +05:30
H.J. Lu
4e61a6be44 i386: Increase MALLOC_ALIGNMENT to 16 [BZ #21120]
GCC 7 changed the definition of max_align_t on i386:

https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=9b5c49ef97e63cc63f1ffa13baf771368105ebe2

As a result, glibc malloc no longer returns memory blocks which are as
aligned as max_align_t requires.

This causes malloc/tst-malloc-thread-fail to fail with an error like this
one:

error: allocation function 0, size 144 not aligned to 16

This patch moves the MALLOC_ALIGNMENT definition to <malloc-alignment.h>
and increases the malloc alignment to 16 for i386.

	[BZ #21120]
	* malloc/malloc-internal.h (MALLOC_ALIGNMENT): Moved to ...
	* sysdeps/generic/malloc-alignment.h: Here.  New file.
	* sysdeps/i386/malloc-alignment.h: Likewise.
	* sysdeps/generic/malloc-machine.h: Include <malloc-alignment.h>.
2017-06-30 09:11:24 -07:00
Florian Weimer
a9270e673d resolv: Improve debugging output from tst-resolv-res_init 2017-06-30 18:02:11 +02:00
Florian Weimer
b606c6ce66 resolv: Remove source argument fron res_options 2017-06-30 11:32:19 +02:00
Florian Weimer
3f8f1eb6b0 resolv: Remove DEBUG from resolv/res_query.c 2017-06-30 11:32:12 +02:00
Florian Weimer
6da48ca0b2 resolv: Reformat resolv/res_data.c to GNU style 2017-06-30 11:32:04 +02:00
Florian Weimer
0377511799 resolv: Move res_query, res_search res_querydomain, hostalias
From res_data.c to query.c
2017-06-30 11:31:55 +02:00
Florian Weimer
ded603542a resolv: Move res_isourserver, res_send from res_data.c to res_send.c 2017-06-30 11:31:48 +02:00
Florian Weimer
6781d8e693 resolv: Turn _res_opcodes into a compatibility symbol 2017-06-30 11:31:41 +02:00
Florian Weimer
d85f99679d resolv: Move fp_nquery, fp_query, p_query, _res_opcodes
From res_data.c to res_debug.c.

Also drop the unnecessary _res initialization from fp_nquery.
2017-06-30 11:31:35 +02:00
Florian Weimer
4d4ce84924 resolv: Remove unused resolv/res_debug.h header file 2017-06-30 11:31:29 +02:00
Florian Weimer
09fbb56ad6 resolv: Remove DEBUG from resolv/res_send.c 2017-06-30 11:31:24 +02:00
Florian Weimer
5ca4aaea18 resolv: Move the res_mkquery function to the resolv/mk_query.c file 2017-06-30 11:31:18 +02:00
Florian Weimer
74084febc4 resolv: Reformat resolv/res_mkquery.c to GNU style 2017-06-30 11:31:12 +02:00
Florian Weimer
7ab27b76d2 resolv: Remove DEBUG macro from resolv/res_mkquery.c 2017-06-30 11:31:02 +02:00
Florian Weimer
5f17245d3e support: Report actual exit status in support_capture_subprocess_check 2017-06-30 11:30:48 +02:00
Florian Weimer
5b757a51b5 resolv: Make RES_ROTATE start with a random name server [BZ #19570]
Do not copy the actual name server addresses to rotate them.  Use a
global rotation offset instead.
2017-06-30 10:43:33 +02:00
Mike Frysinger
867c5c33e2 localedata: CLDRv29: update LC_ADDRESS.lang_name translations
This updates a bunch of locales based on CLDR v29 data:
  az_AZ: changing Azərbaycanca to azərbaycan dili
  be_BY: changing беларуская мова to беларуская
  bem_ZM: changing iciBemba to Ichibemba
  bg_BG: changing български език to български
  bo_CN: changing པོད་སྐད་ to བོད་སྐད་
  bo_IN: changing པོད་སྐད་ to བོད་སྐད་
  br_FR: changing Brezhoneg to brezhoneg
  brx_IN: lang_name: setting to बड़ो
  ce_RU: changing нохчийн мотт to нохчийн
  cs_CZ: changing Čeština to čeština
  dz_BT: changing (རྫོང་ཁ to རྫོང་ཁ
  el_CY: changing ελληνικά to Ελληνικά
  el_GR: changing ελληνικά to Ελληνικά
  es_AR: changing Español to español
  es_BO: changing Español to español
  es_CL: changing Español to español
  es_CO: changing Español to español
  es_CR: changing Español to español
  es_CU: changing Español to español
  es_DO: changing Español to español
  es_EC: changing Español to español
  es_ES: changing Español to español
  es_GT: changing Español to español
  es_HN: changing Español to español
  es_MX: changing Español to español
  es_NI: changing Español to español
  es_PA: changing Español to español
  es_PE: changing Español to español
  es_PR: changing Español to español
  es_PY: changing Español to español
  es_SV: changing Español to español
  es_US: changing Español to español
  es_UY: changing Español to español
  es_VE: changing Español to español
  et_EE: changing eesti keel to eesti
  eu_ES: changing Euskara to euskara
  fr_BE: changing Français to français
  fr_CA: changing Français to français
  fr_CH: changing Français to français
  fr_FR: changing Français to français
  fr_LU: changing Français to français
  fur_IT: changing Furlan to furlan
  fy_NL: changing Frysk to West-Frysk
  gl_ES: changing Galego to galego
  gv_GB: changing y Ghaelg to Gaelg
  he_IL: lang_name: setting to עברית
  hsb_DE: changing Hornjoserbšćina to hornjoserbšćina
  hy_AM: changing Հայերեն to հայերեն
  id_ID: changing Bahasa Indonesia to Bahasa Indonesia
  it_CH: changing Italiano to italiano
  it_IT: changing Italiano to italiano
  kl_GL: changing Kalaallisut to kalaallisut
  km_KH: changing ភាសាខ្មែរ to ខ្មែរ
  ko_KR: changing 한국말 to 한국어
  ks_IN: changing kạ̄šur to کٲشُر
  kw_GB: changing Kernowek to kernewek
  ky_KG: changing Кыргызча to кыргызча
  lg_UG: changing Oluganda to Luganda
  lt_LT: changing lietuvių kalba to lietuvių
  lv_LV: changing latviešu valoda to latviešu
  mk_MK: changing македонск/и јазик to македонски
  mn_MN: changing Монгол хэл to монгол
  nb_NO: changing Bokmål to norsk bokmål
  nn_NO: changing Nynorsk to nynorsk
  os_RU: lang_name: setting to ирон
  ru_RU: lang_name: setting to русский
  ru_UA: lang_name: setting to русский
  se_NO: changing Davvisámegiella to davvisámegiella
  sk_SK: lang_name: setting to slovenčina
  ta_IN: lang_name: setting to தமிழ்
  ta_LK: lang_name: setting to தமிழ்
  tk_TM: changing Türkmençe to türkmençe
  tr_CY: changing Turkish to Türkçe
  tr_TR: changing Turkish to Türkçe
  ur_IN: lang_name: setting to {اردو}
  ur_PK: lang_name: setting to {اردو}
  vi_VN: changing Việt ngữ to Tiếng Việt
  yo_NG: changing Yorùbá to Èdè Yorùbá
  zu_ZA: changing IsiZulu to isiZulu

Most of these are simple case changes, but they match the CLDR db.
A search for a few of the others suggests they're also correct.
2017-06-30 06:41:49 +02:00