From: Alan Modra Date: Mon, 14 Jul 2014 11:44:50 +0000 (+0930) Subject: Correct DT_PPC64_NUM X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b59b0c6c3f8a9434fe5d4ee1a954091ad29669c1;p=thirdparty%2Fglibc.git Correct DT_PPC64_NUM [BZ #17153] * elf/elf.h (DT_PPC64_NUM): Correct value. * NEWS: Add to fixed bug list. (cherry picked from commit f6c44d475104e931bab2b4ffa499961088de673c) Conflicts: NEWS --- diff --git a/ChangeLog b/ChangeLog index 396430509c2..51573d0c2d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-09-11 Alan Modra + + [BZ #17153] + * elf/elf.h (DT_PPC64_NUM): Correct value. + * NEWS: Add to fixed bug list. + 2014-03-20 Andreas Schwab [BZ #16743] diff --git a/NEWS b/NEWS index be59ead5b76..fb0fa3cd47b 100644 --- a/NEWS +++ b/NEWS @@ -10,8 +10,8 @@ Version 2.19.1 * The following bugs are resolved with this release: 15946, 16545, 16574, 16623, 16657, 16695, 16743, 16878, 16882, 16885, - 16916, 16932, 16943, 16958, 17048, 17069, 17137, 17213, 17263, 17325, - 17555, 18287. + 16916, 16932, 16943, 16958, 17048, 17069, 17137, 17153, 17213, 17263, + 17325, 17555, 18287. * A buffer overflow in gethostbyname_r and related functions performing DNS requests has been fixed. If the NSS functions were called with a diff --git a/elf/elf.h b/elf/elf.h index 40e87b21c3c..78815e8655f 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -2283,7 +2283,7 @@ typedef Elf32_Addr Elf32_Conflict; #define DT_PPC64_OPD (DT_LOPROC + 1) #define DT_PPC64_OPDSZ (DT_LOPROC + 2) #define DT_PPC64_OPT (DT_LOPROC + 3) -#define DT_PPC64_NUM 3 +#define DT_PPC64_NUM 4 /* PowerPC64 specific values for the DT_PPC64_OPT Dyn entry. */ #define PPC64_OPT_TLS 1