r6384 - in glibc-package/branches/glibc-2.21/debian: . patches/arm patches/i386
Author: adconrad
Date: 2015-03-16 22:48:41 +0000 (Mon, 16 Mar 2015)
New Revision: 6384
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff
glibc-package/branches/glibc-2.21/debian/patches/arm/unsubmitted-ldso-abi-check.diff
glibc-package/branches/glibc-2.21/debian/patches/i386/submitted-i686-timing.diff
Log:
* debian/patches/i386/submitted-i686-timing.diff: Fix -Wundef warnings.
* debian/patches/arm/unsubmitted-ldso-abi-check.diff: Fix build failures
from format mismatches, uninitialised variables, and const conversions.
* debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff: Same as above.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-16 17:17:29 UTC (rev 6383)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-16 22:48:41 UTC (rev 6384)
@@ -94,6 +94,10 @@
which no longer shows up in random support libraries' symbol tables.
* debian/sysdeps/*: Neither ports nor nptl are considered add-ons anymore.
* debian/debhelper.in/glibc-doc.install: Install changelogs that exist.
+ * debian/patches/i386/submitted-i686-timing.diff: Fix -Wundef warnings.
+ * debian/patches/arm/unsubmitted-ldso-abi-check.diff: Fix build failures
+ from format mismatches, uninitialised variables, and const conversions.
+ * debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff: Same as above.
* Other than two hurd-i386 patches required as scaffolding for others,
all the hurd-i386 patches are disabled, so this build *will* fail there.
* kfreebsd's sysdeps patches almost certainly need updating for 2.21 too.
Modified: glibc-package/branches/glibc-2.21/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff 2015-03-16 17:17:29 UTC (rev 6383)
+++ glibc-package/branches/glibc-2.21/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff 2015-03-16 22:48:41 UTC (rev 6384)
@@ -2,7 +2,7 @@
index e767f9e..37483fc 100644
--- a/sysdeps/unix/sysv/linux/arm/readelflib.c
+++ b/sysdeps/unix/sysv/linux/arm/readelflib.c
-@@ -25,6 +25,130 @@ int process_elf64_file (const char *file_name, const char *lib, int *flag,
+@@ -25,6 +25,131 @@ int process_elf64_file (const char *file_name, const char *lib, int *flag,
unsigned int *osversion, char **soname,
void *file_contents, size_t file_length);
@@ -10,8 +10,8 @@
+ P incremented past the value. We assume that a word is large enough to
+ hold any value so encoded; if it is smaller than a pointer on some target,
+ pointers should not be leb128 encoded on that target. */
-+static const unsigned char *
-+read_uleb128 (const unsigned char *p, unsigned long *val)
++static unsigned char *
++read_uleb128 (unsigned char *p, unsigned long *val)
+{
+ unsigned int shift = 0;
+ unsigned char byte;
@@ -86,7 +86,8 @@
+ * (ABI_VFP_args) */
+ while (section_len > 0)
+ {
-+ unsigned long tag, val;
++ unsigned long val = 0;
++ unsigned long tag;
+ unsigned long size;
+
+ end = p;
Modified: glibc-package/branches/glibc-2.21/debian/patches/arm/unsubmitted-ldso-abi-check.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/arm/unsubmitted-ldso-abi-check.diff 2015-03-16 17:17:29 UTC (rev 6383)
+++ glibc-package/branches/glibc-2.21/debian/patches/arm/unsubmitted-ldso-abi-check.diff 2015-03-16 22:48:41 UTC (rev 6384)
@@ -4,7 +4,7 @@
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
-@@ -1644,6 +1644,208 @@
+@@ -1644,6 +1644,209 @@
_dl_debug_printf_c ("\t\t(%s)\n", what);
}
@@ -13,8 +13,8 @@
+ P incremented past the value. We assume that a word is large enough to
+ hold any value so encoded; if it is smaller than a pointer on some target,
+ pointers should not be leb128 encoded on that target. */
-+static const unsigned char *
-+read_uleb128 (const unsigned char *p, unsigned long *val)
++static unsigned char *
++read_uleb128 (unsigned char *p, unsigned long *val)
+{
+ unsigned int shift = 0;
+ unsigned char byte;
@@ -106,7 +106,8 @@
+ * (ABI_VFP_args) */
+ while (section_len > 0)
+ {
-+ unsigned long tag, val;
++ unsigned long val = 0;
++ unsigned long tag;
+ unsigned long size;
+
+ end = p;
@@ -125,7 +126,7 @@
+ if (ATTR_TAG_FILE != tag)
+ {
+ /* ignore, we don't care */
-+ _dl_debug_printf_c (" ignoring unknown subsection with type %u length %lu\n", tag, size);
++ _dl_debug_printf_c (" ignoring unknown subsection with type %lu length %lu\n", tag, size);
+ p = end;
+ continue;
+ }
Modified: glibc-package/branches/glibc-2.21/debian/patches/i386/submitted-i686-timing.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/i386/submitted-i686-timing.diff 2015-03-16 17:17:29 UTC (rev 6383)
+++ glibc-package/branches/glibc-2.21/debian/patches/i386/submitted-i686-timing.diff 2015-03-16 22:48:41 UTC (rev 6384)
@@ -38,7 +38,7 @@
EXTERN struct link_map *_dl_initfirst;
-#if HP_SMALL_TIMING_AVAIL
-+#if HP_SMALL_TIMING_AVAIL || HP_TIMING_PAD
++#if HP_SMALL_TIMING_AVAIL || defined HP_TIMING_PAD
/* Start time on CPU clock. */
EXTERN hp_timing_t _dl_cpuclock_offset;
#endif
Reply to: