From 804254edb48f87d726a1bc9e95af04076c030e35 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sat, 23 May 2020 08:25:10 +0100 Subject: [PATCH] Darwin: Make sanitizer local vars linker-visible. Another case where we need a linker-visible symbols in order to preserve the ld64 atom model. If these symbols are emitted as 'local' the linker cannot see that they are separate from any global weak entry that precedes them. This will cause the linker to complain that there is (apparently) direct access to such a weak global, preventing it from being replaced. This is a short-term fix for the problem - we need generic handling for relevant cases (that also does not pessimise objects by emitting unnecessary symbols and relocations). gcc/ChangeLog: 2020-05-23 Iain Sandoe * config/darwin.h (ASM_GENERATE_INTERNAL_LABEL): Make ubsan_{data,type},ASAN symbols linker-visible. --- gcc/ChangeLog | 5 +++++ gcc/config/darwin.h | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a7b599ff93..ede1f15eb7a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2020-05-23 Iain Sandoe + + * config/darwin.h (ASM_GENERATE_INTERNAL_LABEL): Make + ubsan_{data,type},ASAN symbols linker-visible. + 2020-05-22 Jan Hubicka * lto-streamer-out.c (DFS::DFS): Silence warning. diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 27665b34a18..f528b1766bf 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -808,6 +808,12 @@ extern GTY(()) section * darwin_sections[NUM_DARWIN_SECTIONS]; do { \ if (strcmp ("LC", PREFIX) == 0) \ sprintf (LABEL, "*%s%ld", "lC", (long)(NUM)); \ + else if (strcmp ("Lubsan_data", PREFIX) == 0) \ + sprintf (LABEL, "*%s%ld", "lubsan_data", (long)(NUM));\ + else if (strcmp ("Lubsan_type", PREFIX) == 0) \ + sprintf (LABEL, "*%s%ld", "lubsan_type", (long)(NUM));\ + else if (strcmp ("LASAN", PREFIX) == 0) \ + sprintf (LABEL, "*%s%ld", "lASAN", (long)(NUM));\ else \ sprintf (LABEL, "*%s%ld", PREFIX, (long)(NUM)); \ } while (0) -- 2.30.2