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

diff --git a/config/ChangeLog b/config/ChangeLog
index 3a488a1ae351aabfcfd23a231c812002d04c4b68..ef58a91545bb951f1e961684b709200c67f26fdb 100644 (file)
--- 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 d2615e8f807b4e15bd4d611fbee2edb6f0b3083f..1d85fe1c836dce0a54d2b7577fb91db93b1081db 100644 (file)
--- 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 a116d3731001820598e66af2e55494c2b2580808..b249226155c99a9d9031029b1548cc06114ba601 100644 (file)
--- 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 f106d2262cadb55401a3fceeb32f96d77b748e98..4dd5186a69a1c1dbfcbe350518773f9f6e7a8ed7 100644 (file)
--- 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