From 7b737e43f82682bcfaa086af116ddcddb9c1de8d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 25 Jul 2016 15:57:02 -0700 Subject: [PATCH] Remove #pragma GCC visibility. We have better control over visibility now. Bug: http://b/24767418 Change-Id: Ifa9a1e5af4bd4217db08422050908770247b3b69 --- libc/dns/include/resolv_private.h | 5 ----- libc/include/complex.h | 2 -- libc/include/fenv.h | 2 -- libc/include/netdb.h | 2 -- libc/include/resolv.h | 2 -- libc/stdio/local.h | 4 ---- 6 files changed, 17 deletions(-) diff --git a/libc/dns/include/resolv_private.h b/libc/dns/include/resolv_private.h index 8dad9263a..54b9626a1 100644 --- a/libc/dns/include/resolv_private.h +++ b/libc/dns/include/resolv_private.h @@ -63,9 +63,6 @@ #include #include -/* Despite this file's name, it's part of libresolv. On Android, that means it's part of libc :-( */ -#pragma GCC visibility push(default) - // Linux defines MAXHOSTNAMELEN as 64, while the domain name limit in // RFC 1034 and RFC 1035 is 255 octets. #ifdef MAXHOSTNAMELEN @@ -547,6 +544,4 @@ int ns_name_labels(ns_nname_ct, size_t); __END_DECLS -#pragma GCC visibility pop - #endif /* !_RESOLV_PRIVATE_H_ */ diff --git a/libc/include/complex.h b/libc/include/complex.h index e874e1c29..f4dc124a9 100644 --- a/libc/include/complex.h +++ b/libc/include/complex.h @@ -56,7 +56,6 @@ _Static_assert(__generic(_Complex_I, float _Complex, 1, 0), #endif __BEGIN_DECLS -#pragma GCC visibility push(default) /* 7.3.5 Trigonometric functions */ /* 7.3.5.1 The cacos functions */ @@ -156,7 +155,6 @@ double creal(double complex) __INTRODUCED_IN(23); float crealf(float complex) __INTRODUCED_IN(23); long double creall(long double complex) __INTRODUCED_IN(23); -#pragma GCC visibility pop __END_DECLS #endif /* _COMPLEX_H */ diff --git a/libc/include/fenv.h b/libc/include/fenv.h index d4f69944a..f1b2b25e2 100644 --- a/libc/include/fenv.h +++ b/libc/include/fenv.h @@ -34,7 +34,6 @@ #include __BEGIN_DECLS -#pragma GCC visibility push(default) // fenv was always available on x86. int feclearexcept(int) __INTRODUCED_IN_ARM(21) __INTRODUCED_IN_MIPS(21) __INTRODUCED_IN_X86(9); @@ -69,7 +68,6 @@ int fegetexcept(void) __INTRODUCED_IN_ARM(21) __INTRODUCED_IN_MIPS(21) __INTRODU extern const fenv_t __fe_dfl_env; #define FE_DFL_ENV (&__fe_dfl_env) -#pragma GCC visibility pop __END_DECLS #endif /* ! _FENV_H_ */ diff --git a/libc/include/netdb.h b/libc/include/netdb.h index 6bcfdcd27..7fcb11f34 100644 --- a/libc/include/netdb.h +++ b/libc/include/netdb.h @@ -193,7 +193,6 @@ struct addrinfo { #define SCOPE_DELIMITER '%' __BEGIN_DECLS -#pragma GCC visibility push(default) /* BIONIC-BEGIN */ #define h_errno (*__get_h_errno()) @@ -225,7 +224,6 @@ void freeaddrinfo(struct addrinfo *); const char *gai_strerror(int); void setservent(int); -#pragma GCC visibility pop __END_DECLS #endif /* !_NETDB_H_ */ diff --git a/libc/include/resolv.h b/libc/include/resolv.h index aca3552cf..2c1281949 100644 --- a/libc/include/resolv.h +++ b/libc/include/resolv.h @@ -38,7 +38,6 @@ #include __BEGIN_DECLS -#pragma GCC visibility push(default) #define b64_ntop __b64_ntop int b64_ntop(u_char const*, size_t, char*, size_t); @@ -60,7 +59,6 @@ int res_mkquery(int, const char*, int, int, const u_char*, int, const u_char*, u int res_query(const char*, int, int, u_char*, int); int res_search(const char*, int, int, u_char*, int); -#pragma GCC visibility pop __END_DECLS #endif /* _RESOLV_H_ */ diff --git a/libc/stdio/local.h b/libc/stdio/local.h index 7fe339ac7..f25e90213 100644 --- a/libc/stdio/local.h +++ b/libc/stdio/local.h @@ -200,8 +200,6 @@ __LIBC32_LEGACY_PUBLIC__ fpos_t __sseek(void *, fpos_t, int); __LIBC32_LEGACY_PUBLIC__ int __sclose(void *); __LIBC32_LEGACY_PUBLIC__ int _fwalk(int (*)(FILE *)); -#pragma GCC visibility push(hidden) - off64_t __sseek64(void*, off64_t, int); int __sflush_locked(FILE *); int __swhatbuf(FILE *, size_t *, int *); @@ -271,8 +269,6 @@ wint_t __fputwc_unlock(wchar_t wc, FILE *fp); extern void __sinit(void); // Not actually implemented. #define __sdidinit 1 -#pragma GCC visibility pop - __END_DECLS #endif