svn commit: trunk/uClibc/ldso: include ldso/bfin

[bernds at uclibc.org]

Author: bernds
Date: 2008-01-08 15:24:30 -0800 (Tue, 08 Jan 2008)
New Revision: 20829

Log:
Some more Blackfin/FDPIC ldso merging work.  Include dl-inlines.h when it
exists, and move some definitions to their proper place.


Modified:
   trunk/uClibc/ldso/include/ldso.h
   trunk/uClibc/ldso/ldso/bfin/dl-startup.h
   trunk/uClibc/ldso/ldso/bfin/dl-sysdep.h


Changeset:
Modified: trunk/uClibc/ldso/include/ldso.h
===================================================================
--- trunk/uClibc/ldso/include/ldso.h	2008-01-08 21:05:50 UTC (rev 20828)
+++ trunk/uClibc/ldso/include/ldso.h	2008-01-08 23:24:30 UTC (rev 20829)
@@ -117,4 +117,8 @@
 		ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
 		DL_GET_READY_TO_RUN_EXTRA_PARMS);
 
+#ifdef HAVE_DL_INLINES_H
+#include <dl-inlines.h>
+#endif
+
 #endif /* _LDSO_H_ */

Modified: trunk/uClibc/ldso/ldso/bfin/dl-startup.h
===================================================================
--- trunk/uClibc/ldso/ldso/bfin/dl-startup.h	2008-01-08 21:05:50 UTC (rev 20828)
+++ trunk/uClibc/ldso/ldso/bfin/dl-startup.h	2008-01-08 23:24:30 UTC (rev 20829)
@@ -106,17 +106,6 @@
 #define GET_ARGV(ARGVP, ARGS) ARGVP = (((unsigned long*) ARGS) + 1)
 
 /*
- * Compute the GOT address.  On several platforms, we use assembly
- * here.  on FR-V FDPIC, there's no way to compute the GOT address,
- * since the offset between text and data is not fixed, so we arrange
- * for the assembly _dl_boot to pass this value as an argument to
- * _dl_boot.  */
-#define DL_BOOT_COMPUTE_GOT(got) ((got) = dl_boot_got_pointer)
-
-#define DL_BOOT_COMPUTE_DYN(dpnt, got, load_addr) \
-  ((dpnt) = dl_boot_ldso_dyn_pointer)
-
-/*
  * Here is a macro to perform a relocation.  This is only used when
  * bootstrapping the dynamic loader.  RELP is the relocation that we
  * are performing, REL is the pointer to the address we are relocating.

Modified: trunk/uClibc/ldso/ldso/bfin/dl-sysdep.h
===================================================================
--- trunk/uClibc/ldso/ldso/bfin/dl-sysdep.h	2008-01-08 21:05:50 UTC (rev 20828)
+++ trunk/uClibc/ldso/ldso/bfin/dl-sysdep.h	2008-01-08 23:24:30 UTC (rev 20829)
@@ -34,6 +34,8 @@
 
 #define DL_NO_COPY_RELOCS
 
+#define HAVE_DL_INLINES_H
+
 /*
  * Initialization sequence for a GOT.  Copy the resolver function
  * descriptor and the pointer to the elf_resolve/link_map data
@@ -136,6 +138,17 @@
 #define DL_ADDR_IN_LOADADDR(ADDR, TPNT, TFROM) \
   (! (TFROM) && __dl_addr_in_loadaddr ((void*)(ADDR), (TPNT)->loadaddr))
 
+/*
+ * Compute the GOT address.  On several platforms, we use assembly
+ * here.  on FR-V FDPIC, there's no way to compute the GOT address,
+ * since the offset between text and data is not fixed, so we arrange
+ * for the assembly _dl_boot to pass this value as an argument to
+ * _dl_boot.  */
+#define DL_BOOT_COMPUTE_GOT(got) ((got) = dl_boot_got_pointer)
+
+#define DL_BOOT_COMPUTE_DYN(dpnt, got, load_addr) \
+  ((dpnt) = dl_boot_ldso_dyn_pointer)
+
 /* We only support loading FDPIC independently-relocatable shared
    libraries.  It probably wouldn't be too hard to support loading
    shared libraries that require relocation by the same amount, but we