[uClibc-cvs] uClibc/ldso/include ld_elf.h,1.5,1.6 ldso.h,1.3,1.4
Erik Andersen
andersen at uclibc.org
Thu Jan 29 11:42:48 UTC 2004
Update of /var/cvs/uClibc/ldso/include
In directory nail:/tmp/cvs-serv13505/include
Modified Files:
ld_elf.h ldso.h
Log Message:
Scrub up use of ELF_USES_RELOCA and eliminte some unsightly ifdefs
Index: ld_elf.h
===================================================================
RCS file: /var/cvs/uClibc/ldso/include/ld_elf.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ld_elf.h 29 Jan 2004 10:44:49 -0000 1.5
+++ ld_elf.h 29 Jan 2004 11:42:45 -0000 1.6
@@ -77,11 +77,20 @@
*/
#ifdef ELF_USES_RELOCA
# define ELF_RELOC ElfW(Rela)
+# define DT_RELOC_TABLE_ADDR DT_RELA
+# define DT_RELOC_TABLE_SIZE DT_RELASZ
+# define UNSUPPORTED_RELOC_TYPE DT_REL
+# define UNSUPPORTED_RELOC_STR "REL"
#else
# define ELF_RELOC ElfW(Rel)
+# define DT_RELOC_TABLE_ADDR DT_REL
+# define DT_RELOC_TABLE_SIZE DT_RELSZ
+# define UNSUPPORTED_RELOC_TYPE DT_RELA
+# define UNSUPPORTED_RELOC_STR "RELA"
#endif
+
/* Convert between the Linux flags for page protections and the
ones specified in the ELF standard. */
#define LXFLAGS(X) ( (((X) & PF_R) ? PROT_READ : 0) | \
Index: ldso.h
===================================================================
RCS file: /var/cvs/uClibc/ldso/include/ldso.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ldso.h 6 Jan 2004 01:05:12 -0000 1.3
+++ ldso.h 29 Jan 2004 11:42:45 -0000 1.4
@@ -15,3 +15,18 @@
# define PAGE_SHIFT 12
# define PAGE_SIZE (1UL << PAGE_SHIFT)
#endif
+
+/* Prepare for the case that `__builtin_expect' is not available. */
+#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
+#define __builtin_expect(x, expected_value) (x)
+#endif
+#ifndef likely
+# define likely(x) __builtin_expect((!!(x)),1)
+#endif
+#ifndef unlikely
+# define unlikely(x) __builtin_expect((!!(x)),0)
+#endif
+#ifndef __LINUX_COMPILER_H
+#define __LINUX_COMPILER_H
+#endif
+
More information about the uClibc-cvs
mailing list