diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:58:31 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:58:31 +0200 |
commit | 7dc949b4cfc2a1984315fc550541f10824a8ed0c (patch) | |
tree | 50250f9a0ca5edab82874851096993e3f4990f3f /csu | |
parent | 1090dca5a801410bee6580635070dcbb90a72d01 (diff) | |
parent | 7bb5f8a836b916d6ebf7b6921b136e99cea2442d (diff) |
Merge branch 'baseline' into refs/top-bases/t/tls-threadvar
Diffstat (limited to 'csu')
-rw-r--r-- | csu/Makefile | 13 | ||||
-rw-r--r-- | csu/abi-note.S | 2 | ||||
-rw-r--r-- | csu/check_fds.c | 2 | ||||
-rw-r--r-- | csu/dso_handle.c | 2 | ||||
-rw-r--r-- | csu/elf-init.c | 2 | ||||
-rw-r--r-- | csu/errno-loc.c | 2 | ||||
-rw-r--r-- | csu/errno.c | 2 | ||||
-rw-r--r-- | csu/gmon-start.c | 2 | ||||
-rw-r--r-- | csu/init-first.c | 2 | ||||
-rw-r--r-- | csu/init.c | 2 | ||||
-rw-r--r-- | csu/libc-start.c | 2 | ||||
-rw-r--r-- | csu/libc-tls.c | 2 | ||||
-rw-r--r-- | csu/tst-atomic-long.c | 2 | ||||
-rw-r--r-- | csu/tst-atomic.c | 2 | ||||
-rw-r--r-- | csu/version.c | 4 |
15 files changed, 25 insertions, 18 deletions
diff --git a/csu/Makefile b/csu/Makefile index 9f0855a6ac..31e8bb98a0 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -1,5 +1,5 @@ # Makefile for csu code for GNU C library. -# Copyright (C) 1995-2015 Free Software Foundation, Inc. +# Copyright (C) 1995-2016 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 @@ -47,6 +47,9 @@ tests-static := tst-empty ifeq (yes,$(build-shared)) extra-objs += S$(start-installed-name) gmon-start.os +ifneq ($(start-installed-name),$(static-start-installed-name)) +extra-objs += gmon-start.o +endif install-lib += S$(start-installed-name) generated += start.os else @@ -98,10 +101,14 @@ endif # startfile with gmon-start.o, which defines a constructor function # to turn on profiling code at startup. ifeq (yes,$(build-shared)) -$(addprefix $(objpfx),$(sort g$(start-installed-name) \ - g$(static-start-installed-name))): \ +$(objpfx)g$(start-installed-name): \ $(objpfx)g%: $(objpfx)S% $(objpfx)gmon-start.os $(link-relocatable) +ifneq ($(start-installed-name),$(static-start-installed-name)) +$(objpfx)g$(static-start-installed-name): \ + $(objpfx)g%: $(objpfx)% $(objpfx)gmon-start.o + $(link-relocatable) +endif else $(addprefix $(objpfx),$(sort g$(start-installed-name) \ g$(static-start-installed-name))): \ diff --git a/csu/abi-note.S b/csu/abi-note.S index 5da3701fa1..eed2ceb718 100644 --- a/csu/abi-note.S +++ b/csu/abi-note.S @@ -1,5 +1,5 @@ /* Special .init and .fini section support. - Copyright (C) 1997-2015 Free Software Foundation, Inc. + Copyright (C) 1997-2016 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 diff --git a/csu/check_fds.c b/csu/check_fds.c index 9271aaf959..baa77a95d7 100644 --- a/csu/check_fds.c +++ b/csu/check_fds.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2015 Free Software Foundation, Inc. +/* Copyright (C) 2000-2016 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 diff --git a/csu/dso_handle.c b/csu/dso_handle.c index 43c414b0a2..7a614ca3b3 100644 --- a/csu/dso_handle.c +++ b/csu/dso_handle.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2015 Free Software Foundation, Inc. +/* Copyright (C) 2002-2016 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 diff --git a/csu/elf-init.c b/csu/elf-init.c index a7e534da62..0fb98f1606 100644 --- a/csu/elf-init.c +++ b/csu/elf-init.c @@ -1,5 +1,5 @@ /* Startup support for ELF initializers/finalizers in the main executable. - Copyright (C) 2002-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2016 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 diff --git a/csu/errno-loc.c b/csu/errno-loc.c index b893e1babc..d8bbb5fd8b 100644 --- a/csu/errno-loc.c +++ b/csu/errno-loc.c @@ -1,6 +1,6 @@ /* MT support function to get address of `errno' variable, non-threaded version. - Copyright (C) 1996-2015 Free Software Foundation, Inc. + Copyright (C) 1996-2016 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 diff --git a/csu/errno.c b/csu/errno.c index 1c354749bc..778c941edb 100644 --- a/csu/errno.c +++ b/csu/errno.c @@ -1,5 +1,5 @@ /* Definition of `errno' variable. Canonical version. - Copyright (C) 2002-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2016 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 diff --git a/csu/gmon-start.c b/csu/gmon-start.c index d733d91b79..62c123c9a9 100644 --- a/csu/gmon-start.c +++ b/csu/gmon-start.c @@ -1,5 +1,5 @@ /* Code to enable profiling at program startup. - Copyright (C) 1995-2015 Free Software Foundation, Inc. + Copyright (C) 1995-2016 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 diff --git a/csu/init-first.c b/csu/init-first.c index b3bacdd0e3..77c6e1cb9e 100644 --- a/csu/init-first.c +++ b/csu/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. Common version - Copyright (C) 1995-2015 Free Software Foundation, Inc. + Copyright (C) 1995-2016 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 diff --git a/csu/init.c b/csu/init.c index 2fbbd5e36e..93277268bb 100644 --- a/csu/init.c +++ b/csu/init.c @@ -1,5 +1,5 @@ /* Special startup support. - Copyright (C) 1997-2015 Free Software Foundation, Inc. + Copyright (C) 1997-2016 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 diff --git a/csu/libc-start.c b/csu/libc-start.c index 1e3b350e78..bf5eb69b27 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 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 diff --git a/csu/libc-tls.c b/csu/libc-tls.c index 3f134252a3..d6425e0189 100644 --- a/csu/libc-tls.c +++ b/csu/libc-tls.c @@ -1,5 +1,5 @@ /* Initialization code for TLS in statically linked application. - Copyright (C) 2002-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2016 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 diff --git a/csu/tst-atomic-long.c b/csu/tst-atomic-long.c index d13fb074c0..6b62299d60 100644 --- a/csu/tst-atomic-long.c +++ b/csu/tst-atomic-long.c @@ -1,5 +1,5 @@ /* Tests for atomic.h macros. - Copyright (C) 2003-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. diff --git a/csu/tst-atomic.c b/csu/tst-atomic.c index 83309ebc9d..f7dcac159d 100644 --- a/csu/tst-atomic.c +++ b/csu/tst-atomic.c @@ -1,5 +1,5 @@ /* Tests for atomic.h macros. - Copyright (C) 2003-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. diff --git a/csu/version.c b/csu/version.c index da08129f26..15aab349ee 100644 --- a/csu/version.c +++ b/csu/version.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2015 Free Software Foundation, Inc. +/* Copyright (C) 1992-2016 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 @@ -25,7 +25,7 @@ static const char __libc_version[] = VERSION; static const char banner[] = "GNU C Library "PKGVERSION RELEASE" release version "VERSION", by Roland McGrath et al.\n\ -Copyright (C) 2015 Free Software Foundation, Inc.\n\ +Copyright (C) 2016 Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions.\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ PARTICULAR PURPOSE.\n\ |