aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--scripts/abilist.awk11
-rw-r--r--sysdeps/mach/hurd/i386/libc.abilist2
3 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a18691d..bb53b64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-11-30 Florian Weimer <fweimer@redhat.com>
+
+ * scripts/abilist.awk: Print "0x0" for size 0. Handle "g"/"D".
+ Extend error logging.
+ * sysdeps/mach/hurd/i386/libc.abilist (GLIBC_2.2.6): Adjust _end
+ symbol.
+
2018-11-30 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Use
diff --git a/scripts/abilist.awk b/scripts/abilist.awk
index b40be91..a43400d 100644
--- a/scripts/abilist.awk
+++ b/scripts/abilist.awk
@@ -42,7 +42,11 @@ $2 == "g" || $2 == "w" && (NF == 7 || NF == 8) {
type = $3;
size = $5;
sub(/^0*/, "", size);
- size = " 0x" size;
+ if (size == "") {
+ size = " 0x0";
+ } else {
+ size = " 0x" size;
+ }
version = $6;
symbol = $NF;
gsub(/[()]/, "", version);
@@ -73,6 +77,9 @@ $2 == "g" || $2 == "w" && (NF == 7 || NF == 8) {
else if ($4 == "*ABS*") {
next;
}
+ else if (type == "D") {
+ # Accept unchanged.
+ }
else if (type == "DO") {
type = "D";
}
@@ -89,7 +96,7 @@ $2 == "g" || $2 == "w" && (NF == 7 || NF == 8) {
size = "";
}
else {
- print "ERROR: Unable to handle this type of symbol."
+ print "ERROR: Unable to handle this type of symbol:", $0
exit 1
}
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index d4c4a91..f3993cf 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -554,7 +554,7 @@ GLIBC_2.2.6 __xstat64 F
GLIBC_2.2.6 _authenticate F
GLIBC_2.2.6 _dl_mcount_wrapper F
GLIBC_2.2.6 _dl_mcount_wrapper_check F
-GLIBC_2.2.6 _end GLIBC_2.2.6 g ? D .bss 00000000
+GLIBC_2.2.6 _end D 0x0
GLIBC_2.2.6 _environ D 0x4
GLIBC_2.2.6 _exit F
GLIBC_2.2.6 _flushlbf F