From d81edb99688eb77535a541c0e6edf9546cfce24e Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Thu, 14 Mar 2013 17:51:26 +0530 Subject: ldso: Fix Build warnings with common-generic ABI build CC ldso/ldso/ldso.oS In file included from ./ldso/include/ldso.h:47, from ldso/ldso/ldso.c:33: ./ldso/include/dl-syscall.h:35:1: warning: "S_ISUID" redefined In file included from ./include/bits/kernel_stat.h:10, from ./ldso/include/dl-syscall.h:31, from ./ldso/include/ldso.h:47, from ldso/ldso/ldso.c:33: ./include/sys/stat.h:163:1: warning: this is the location of the previous definition In file included from ./ldso/include/ldso.h:47, from ldso/ldso/ldso.c:33: ./ldso/include/dl-syscall.h:36:1: warning: "S_ISGID" redefined In file included from ./include/bits/kernel_stat.h:10, from ./ldso/include/dl-syscall.h:31, from ./ldso/include/ldso.h:47, from ldso/ldso/ldso.c:33: ./include/sys/stat.h:164:1: warning: this is the location of the previous definition ----------------------------------------------------------------- Cleanly seperated the legacy ABI vs. new ABI scenario. Signed-off-by: Vineet Gupta Cc: Markos Chandras Signed-off-by: Bernhard Reutner-Fischer --- ldso/include/dl-syscall.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index b1f69ab64..675b93ae8 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -20,10 +20,12 @@ extern int _dl_errno; /* For MAP_ANONYMOUS -- differs between platforms */ #define _SYS_MMAN_H 1 #include + +#ifdef __ARCH_HAS_DEPRECATED_SYSCALLS__ /* Pull in whatever this particular arch's kernel thinks the kernel version of * struct stat should look like. It turns out that each arch has a different * opinion on the subject, and different kernel revs use different names... */ -#if !defined __NR_stat || (defined(__sparc_v9__) && (__WORDSIZE == 64)) +#if defined(__sparc_v9__) && (__WORDSIZE == 64) #define kernel_stat64 stat #else #define kernel_stat stat @@ -35,6 +37,13 @@ extern int _dl_errno; #define S_ISUID 04000 /* Set user ID on execution. */ #define S_ISGID 02000 /* Set group ID on execution. */ +#else +/* 1. common-generic ABI doesn't need kernel_stat translation + * 3. S_IS?ID already provided by stat.h + */ +#include +#endif + /* Here are the definitions for some syscalls that are used by the dynamic linker. The idea is that we want to be able -- cgit v1.2.3