Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / string / Makefile

diff --git a/string/Makefile b/string/Makefile
index 901c4d4d77f8caa4aafb70c062f8e804cb312850..bf4fb89b63b21a87245cc2bfc1bb0858f1236e0c 100644 (file)
--- a/string/Makefile
+++ b/string/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2017 Free Software Foundation, Inc.
+# Copyright (C) 1991-2019 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
@@ -22,10 +22,11 @@ subdir      := string
 
 include ../Makeconfig
 
-headers        := string.h strings.h memory.h endian.h bits/endian.h \
-          argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \
-          bits/string.h bits/string2.h bits/string3.h \
-          bits/strings_fortified.h bits/uintn-identity.h
+headers                := string.h bits/string_fortified.h                     \
+                  strings.h bits/strings_fortified.h                   \
+                  byteswap.h bits/byteswap.h                           \
+                  endian.h bits/endian.h bits/uintn-identity.h         \
+                  memory.h argz.h envz.h
 
 routines       := strcat strchr strcmp strcoll strcpy strcspn          \
                   strverscmp strdup strndup                            \
@@ -57,8 +58,10 @@ tests                := tester inl-tester noinl-tester testcopy test-ffs     \
                   bug-strtok1 $(addprefix test-,$(strop-tests))        \
                   bug-envz1 tst-strxfrm2 tst-endian tst-svc2           \
                   tst-strtok_r bug-strcoll2 tst-cmp tst-xbzero-opt     \
-                  test-endian-types
+                  test-endian-types test-endian-file-scope             \
+                  test-endian-sign-conversion
 
+# This test allocates a lot of memory and can run for a long time.
 xtests = tst-strcoll-overflow
 
 ifeq ($(run-built-tests),yes)
@@ -67,13 +70,14 @@ endif
 
 include ../Rules
 
-CFLAGS-inl-tester.c = -fno-builtin
-CFLAGS-noinl-tester.c = -fno-builtin
-CFLAGS-tst-strlen.c = -fno-builtin
-CFLAGS-stratcliff.c = -fno-builtin
-CFLAGS-test-ffs.c = -fno-builtin
-CFLAGS-tst-inlcall.c = -fno-builtin
-CFLAGS-tst-xbzero-opt.c = -O3
+CFLAGS-inl-tester.c += -fno-builtin
+CFLAGS-noinl-tester.c += -fno-builtin
+CFLAGS-tst-strlen.c += -fno-builtin
+CFLAGS-stratcliff.c += -fno-builtin
+CFLAGS-test-ffs.c += -fno-builtin
+CFLAGS-tst-inlcall.c += -fno-builtin
+CFLAGS-tst-xbzero-opt.c += -O3
+CFLAGS-test-endian-sign-conversion.c += -Werror -Wsign-conversion
 # BZ 21006: Resolve all functions but at least explicit_bzero at startup.
 # Otherwise the test fails on s390x as the memcpy in prepare_test_buffer is
 # done by loading r4 / r5 with the test_pattern and using store multiple
@@ -84,8 +88,8 @@ CFLAGS-tst-xbzero-opt.c = -O3
 LDFLAGS-tst-xbzero-opt = -z now
 
 # Called during TLS initialization.
-CFLAGS-memcpy.c = $(no-stack-protector)
-CFLAGS-wordcopy.c = $(no-stack-protector)
+CFLAGS-memcpy.c += $(no-stack-protector)
+CFLAGS-wordcopy.c += $(no-stack-protector)
 
 ifeq ($(run-built-tests),yes)
 $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out
@@ -94,7 +98,7 @@ $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out
 
 LOCALES := de_DE.UTF-8 en_US.ISO-8859-1 en_US.UTF-8 \
            tr_TR.ISO-8859-9 tr_TR.UTF-8 cs_CZ.UTF-8 \
-          da_DK.ISO-8859-1
+          da_DK.ISO-8859-1 en_GB.UTF-8
 include ../gen-locales.mk
 
 $(objpfx)test-strcasecmp.out: $(gen-locales)
@@ -103,5 +107,6 @@ $(objpfx)tst-strxfrm.out: $(gen-locales)
 $(objpfx)tst-strxfrm2.out: $(gen-locales)
 # bug-strcoll2 needs cs_CZ.UTF-8 and da_DK.ISO-8859-1.
 $(objpfx)bug-strcoll2.out: $(gen-locales)
+$(objpfx)tst-strcoll-overflow.out: $(gen-locales)
 
 endif