diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-04-06 11:15:58 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-04-06 11:15:58 +0200 |
| commit | 32e5e786daa69be1f153f01cd428ac18634bb7bc (patch) | |
| tree | ea6947f2380e156ea6ba91f5fa17a67a46304947 /csu | |
| parent | b44389edf1a88c6607a6c365bd8d884aee2edead (diff) | |
| parent | 2e7c805d5ec1f0d2f46354bca65b1feffa7af63b (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/Makefile | 15 | ||||
| -rw-r--r-- | csu/gmon-start.c | 4 | ||||
| -rw-r--r-- | csu/version.c | 8 |
3 files changed, 21 insertions, 6 deletions
diff --git a/csu/Makefile b/csu/Makefile index 1339b5d117..1982c86395 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -1,5 +1,5 @@ # Makefile for csu code for GNU C library. -# Copyright (C) 1995-2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1995-2004, 2005, 2006, 2010 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 @@ -210,9 +210,20 @@ $(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files) linux*) version=`(printf '%s\n%s\n' \ '#include <linux/version.h>' \ UTS_RELEASE \ - | $(CC) $(CPPFLAGS) -E -P - -DNOT_IN_libc=1 | \ + | $(CC) $(CPPFLAGS) -O -E -P - -DNOT_IN_libc=1 | \ sed -e 's/"\([^"]*\)".*/\1/p' -e d) 2>/dev/null`;\ if [ -z "$$version" ]; then \ + version=`(printf '%s\n%s\n' \ + '#include <linux/version.h>' \ + LINUX_VERSION_CODE \ + | $(CC) $(CPPFLAGS) -O -E -P - -DNOT_IN_libc=1 \ + | sed -n -e '/^[123456789].*/p' \ + | awk '{v=$$1; \ + printf("%d.%d.%d\n", \ + v/65535, v/256%256, v%256)}') \ + 2>/dev/null`; \ + fi; \ + if [ -z "$$version" ]; then \ if [ -r /proc/version ]; then \ version=`sed 's/.*Linux version \([^ ]*\) .*/>>\1<</' \ < /proc/version`; \ diff --git a/csu/gmon-start.c b/csu/gmon-start.c index d11c9b9532..7d585e135f 100644 --- a/csu/gmon-start.c +++ b/csu/gmon-start.c @@ -31,9 +31,9 @@ #ifdef ENTRY_POINT_DECL ENTRY_POINT_DECL(extern) #else -extern void ENTRY_POINT; +extern char ENTRY_POINT[]; #endif -extern void etext; +extern char etext[]; #ifndef TEXT_START # ifdef ENTRY_POINT_DECL diff --git a/csu/version.c b/csu/version.c index db913be800..8e32f312a9 100644 --- a/csu/version.c +++ b/csu/version.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1992-2008, 2009, 2010 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 @@ -18,6 +18,7 @@ #include "version.h" #include <tls.h> +#include <libc-abis.h> #include <gnu/libc-version.h> static const char __libc_release[] = RELEASE; @@ -25,12 +26,15 @@ static const char __libc_version[] = VERSION; static const char banner[] = "GNU C Library "RELEASE" release version "VERSION", by Roland McGrath et al.\n\ -Copyright (C) 2009 Free Software Foundation, Inc.\n\ +Copyright (C) 2010 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\ Compiled by GNU CC version "__VERSION__".\n" #include "version-info.h" +#ifdef LIBC_ABIS_STRING +LIBC_ABIS_STRING +#endif #ifdef GLIBC_OLDEST_ABI "The oldest ABI supported: " GLIBC_OLDEST_ABI ".\n" #endif |