update

[l4.git] / l4 / pkg / uclibc / lib / contrib / uclibc / ldso / ldso / frv / dl-startup.h

diff --git a/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/frv/dl-startup.h b/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/frv/dl-startup.h
index 72bea680716da8dafa4bba2e073134733e8bae8f..2aa7baa562edd498830d85c80d0ca8b29663e7b2 100644 (file)
--- a/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/frv/dl-startup.h
+++ b/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/frv/dl-startup.h
@@ -72,8 +72,6 @@ _dl_boot (void *dl_boot_got_pointer, \
          struct funcdesc_value *dl_main_funcdesc, \
          X)
 
-struct elf32_fdpic_loadmap;
-
 /*
  * Get a pointer to the argv array.  On many platforms this can be just
  * the address of the first argument, on other platforms we need to
@@ -81,17 +79,6 @@ struct elf32_fdpic_loadmap;
  */
 #define GET_ARGV(ARGVP, ARGS) ARGVP = ((unsigned long*) ARGS)
 
-/*
- * 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
@@ -100,7 +87,7 @@ struct elf32_fdpic_loadmap;
  * load address.
  */
 #define PERFORM_BOOTSTRAP_RELOC(RELP,REL,SYMBOL,LOAD,SYMTAB) \
-       switch(ELF32_R_TYPE((RELP)->r_info)){                           \
+       switch(ELF_R_TYPE((RELP)->r_info)){                             \
        case R_FRV_32:                                                  \
          *(REL) += (SYMBOL);                                           \
          break;                                                        \