Merge commit '0ebb75608759' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 304e3f108af5 · 2021-08-04T11:18:23.000-07:00
diff --git a/compiler-rt/lib/hwasan/hwasan.cpp b/compiler-rt/lib/hwasan/hwasan.cpp
@@ -319,7 +319,7 @@ void __hwasan_init_static() {
     InitializeSingleGlobal(global);
 }
 
-void __hwasan_init() {
+__attribute__((constructor(0))) void __hwasan_init() {
   CHECK(!hwasan_init_is_running);
   if (hwasan_inited) return;
   hwasan_init_is_running = 1;

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ void __hwasan_init_static() {`
`319`	`319`	`InitializeSingleGlobal(global);`
`320`	`320`	`}`
`321`	`321`
`322`		`-void __hwasan_init() {`
	`322`	`+__attribute__((constructor(0))) void __hwasan_init() {`
`323`	`323`	`CHECK(!hwasan_init_is_running);`
`324`	`324`	`if (hwasan_inited) return;`
`325`	`325`	`hwasan_init_is_running = 1;`