소스 검색

Revert "Fix static linking with GCC-10"

This reverts commit 5b58a1ebd89a4f05778441814e81817c82193fa3.

This breaks all static builds earlier to gcc 10 :(
Bad testing on my side.
Waldemar Brodkorb 3 년 전
부모
커밋
e80384786d
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      libc/misc/elf/dl-support.c
  2. 1 1
      libpthread/nptl/sysdeps/generic/libc-tls.c

+ 1 - 1
libc/misc/elf/dl-support.c

@@ -29,7 +29,7 @@ void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls;
 
 ElfW(Phdr) *_dl_phdr;
 size_t _dl_phnum;
-extern size_t _dl_pagesize;
+size_t _dl_pagesize;
 
 void internal_function _dl_aux_init (ElfW(auxv_t) *av);
 void internal_function _dl_aux_init (ElfW(auxv_t) *av)

+ 1 - 1
libpthread/nptl/sysdeps/generic/libc-tls.c

@@ -72,7 +72,7 @@ struct dtv_slotinfo_list *_dl_tls_dtv_slotinfo_list;
 /* Number of modules in the static TLS block.  */
 size_t _dl_tls_static_nelem;
 /* Size of the static TLS block.  */
-extern size_t _dl_tls_static_size;
+size_t _dl_tls_static_size;
 /* Size actually allocated in the static TLS block.  */
 size_t _dl_tls_static_used;
 /* Alignment requirement of the static TLS block.  */