aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2018-05-10 12:15:42 +0200
committerMartin Liska <marxin@gcc.gnu.org>2018-05-10 10:15:42 +0000
commit84ec5aea4833897a100ca6a3a257ebab23b44f93 (patch)
tree8acd37238d479b3f767c5b85f0c02bfd5203e2ba
parent427a7384b9da2cc9977fa1b1bdada06a8f4a2240 (diff)
downloadgcc-84ec5aea4833897a100ca6a3a257ebab23b44f93.zip
gcc-84ec5aea4833897a100ca6a3a257ebab23b44f93.tar.gz
gcc-84ec5aea4833897a100ca6a3a257ebab23b44f93.tar.bz2
Improve boostrap-ubsan config (PR bootstrap/64914).
2018-05-10 Martin Liska <mliska@suse.cz> PR bootstrap/64914 * bootstrap-ubsan.mk: Define UBSAN_BOOTSTRAP. 2018-05-10 Martin Liska <mliska@suse.cz> PR bootstrap/64914 * md5.c: Use strict alignment with UBSAN_BOOTSTRAP. From-SVN: r260112
-rw-r--r--config/ChangeLog5
-rw-r--r--config/bootstrap-ubsan.mk6
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/md5.c2
4 files changed, 14 insertions, 4 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index 3a488a1..ef58a91 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-10 Martin Liska <mliska@suse.cz>
+
+ PR bootstrap/64914
+ * bootstrap-ubsan.mk: Define UBSAN_BOOTSTRAP.
+
2018-05-09 Joshua Watt <jpewhacker@gmail.com>
* ax_pthread.m4: Add file.
diff --git a/config/bootstrap-ubsan.mk b/config/bootstrap-ubsan.mk
index d2615e8..1d85fe1 100644
--- a/config/bootstrap-ubsan.mk
+++ b/config/bootstrap-ubsan.mk
@@ -1,8 +1,8 @@
# This option enables -fsanitize=undefined for stage2 and stage3.
-STAGE2_CFLAGS += -fsanitize=undefined
-STAGE3_CFLAGS += -fsanitize=undefined
-POSTSTAGE1_LDFLAGS += -fsanitize=undefined -static-libubsan \
+STAGE2_CFLAGS += -fsanitize=undefined -DUBSAN_BOOTSTRAP
+STAGE3_CFLAGS += -fsanitize=undefined -DUBSAN_BOOTSTRAP
+POSTSTAGE1_LDFLAGS += -fsanitize=undefined -static-libubsan -DUBSAN_BOOTSTRAP \
-B$$r/prev-$(TARGET_SUBDIR)/libsanitizer/ \
-B$$r/prev-$(TARGET_SUBDIR)/libsanitizer/ubsan/ \
-B$$r/prev-$(TARGET_SUBDIR)/libsanitizer/ubsan/.libs
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index a116d37..b249226 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-10 Martin Liska <mliska@suse.cz>
+
+ PR bootstrap/64914
+ * md5.c: Use strict alignment with UBSAN_BOOTSTRAP.
+
2018-04-30 Daniel van Gerpen <daniel@vangerpen.de>
* argv.c (expandargv): Fix memory leak for copied argv.
diff --git a/libiberty/md5.c b/libiberty/md5.c
index f106d22..4dd5186a 100644
--- a/libiberty/md5.c
+++ b/libiberty/md5.c
@@ -231,7 +231,7 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
/* Process available complete blocks. */
if (len > 64)
{
-#if !_STRING_ARCH_unaligned
+#if !_STRING_ARCH_unaligned || defined UBSAN_BOOTSTRAP
/* To check alignment gcc has an appropriate operator. Other
compilers don't. */
# if __GNUC__ >= 2