diff --git a/NEWS b/NEWS index d966688a56..76cfbcaa16 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,7 @@ CVE-2020-1752: A use-after-free vulnerability in the glob function when The following bugs are resolved with this release: + [20543] Please move from .gnu.linkonce to comdat [23518] login: Remove utmp backend jump tables [24682] localedata: zh_CN first weekday should be Monday per GB/T 7408-2005 diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h index 749b55b077..eee6d586c1 100644 --- a/sysdeps/i386/sysdep.h +++ b/sysdeps/i386/sysdep.h @@ -61,7 +61,7 @@ lose: SYSCALL_PIC_SETUP \ # define SETUP_PIC_REG(reg) \ .ifndef GET_PC_THUNK(reg); \ - .section .gnu.linkonce.t.GET_PC_THUNK(reg),"ax",@progbits; \ + .section .text.GET_PC_THUNK(reg),"axG",@progbits,GET_PC_THUNK(reg),comdat; \ .globl GET_PC_THUNK(reg); \ .hidden GET_PC_THUNK(reg); \ .p2align 4; \ @@ -97,7 +97,8 @@ GET_PC_THUNK(reg): \ # define SETUP_PIC_REG_STR(reg) \ ".ifndef " GET_PC_THUNK_STR (reg) "\n" \ - ".section .gnu.linkonce.t." GET_PC_THUNK_STR (reg) ",\"ax\",@progbits\n" \ + ".section .text." GET_PC_THUNK_STR (reg) ",\"axG\",@progbits," \ + GET_PC_THUNK_STR (reg) ",comdat\n" \ ".globl " GET_PC_THUNK_STR (reg) "\n" \ ".hidden " GET_PC_THUNK_STR (reg) "\n" \ ".p2align 4\n" \