Index: pace/lib/c/arch/mips32/include/rtld/dynamic.h
===================================================================
--- uspace/lib/c/arch/mips32/include/rtld/dynamic.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
+++ 	(revision )
@@ -1,54 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libcmips32
- * @{
- */
-/** @file
- */
-
-#ifndef LIBC_mips32_RTLD_DYNAMIC_H_
-#define LIBC_mips32_RTLD_DYNAMIC_H_
-
-#include <sys/types.h>
-
-typedef struct {
-	/** Number of local entries in GOT. */
-	uint32_t lgotno;
-	/** Index of first GOT-mapped dynamic symbol. */
-	uint32_t gotsym;
-	/** Number of entries in dynamic symbol table. */
-	uint32_t sym_no;
-	/** ???. */
-	uint32_t base;
-} dyn_info_arch_t;
-
-#endif
-
-/** @}
- */
Index: pace/lib/c/arch/mips32/include/rtld/elf_dyn.h
===================================================================
--- uspace/lib/c/arch/mips32/include/rtld/elf_dyn.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
+++ 	(revision )
@@ -1,58 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libcmips32
- * @{
- */
-/** @file
- */
-
-#ifndef LIBC_mips32_RTLD_ELF_DYN_H_
-#define LIBC_mips32_RTLD_ELF_DYN_H_
-
-/*
- * mips32 program header types
- */
-#define DT_MIPS_BASE_ADDRESS	0x70000006
-#define DT_MIPS_LOCAL_GOTNO	0x7000000a
-#define DT_MIPS_SYMTABNO	0x70000011
-#define DT_MIPS_GOTSYM		0x70000013
-
-/* 
- * mips32 relocation types
- */
-
-#define R_MIPS_NONE		0
-#define R_MIPS_REL32		3
-
-#define R_MIPS_TLS_DTPMOD32	333 /* fixme */
-
-#endif
-
-/** @}
- */
Index: pace/lib/c/arch/mips32/src/rtld/dynamic.c
===================================================================
--- uspace/lib/c/arch/mips32/src/rtld/dynamic.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
+++ 	(revision )
@@ -1,61 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libcmips32
- * @brief
- * @{
- */
-/**
- * @file
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <elf_dyn.h>
-#include <dynamic.h>
-
-void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info)
-{
-//	void *d_ptr;
-	elf_word d_val;
-
-//	d_ptr = (void *)((uint8_t *)dp->d_un.d_ptr + bias);
-	d_val = dp->d_un.d_val;
-
-	switch (dp->d_tag) {
-	case DT_MIPS_BASE_ADDRESS: info->arch.base = d_val; break;
-	case DT_MIPS_LOCAL_GOTNO: info->arch.lgotno = d_val; break;
-	case DT_MIPS_SYMTABNO:	info->arch.sym_no = d_val; break;
-	case DT_MIPS_GOTSYM:	info->arch.gotsym = d_val; break;
-	default: break;
-	}
-}
-
-/** @}
- */
Index: pace/lib/c/arch/mips32/src/rtld/reloc.c
===================================================================
--- uspace/lib/c/arch/mips32/src/rtld/reloc.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
+++ 	(revision )
@@ -1,265 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libcmips32
- * @brief
- * @{
- */
-/**
- * @file
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <elf_dyn.h>
-#include <symbol.h>
-#include <rtld.h>
-#include <rtld_debug.h>
-
-#include <rtld_arch.h>
-
-void module_process_pre_arch(module_t *m)
-{
-	elf_symbol_t *sym_table;
-	elf_symbol_t *sym_def;
-	elf_symbol_t *sym;
-	uint32_t gotsym;
-	uint32_t lgotno;
-	uint32_t *got;
-	char *str_tab;
-	unsigned i, j;
-
-	uint32_t sym_addr;
-	module_t *dest;
-
-	got = (uint32_t *) m->dyn.plt_got;
-	sym_table = m->dyn.sym_tab;
-	str_tab = m->dyn.str_tab;
-	gotsym = m->dyn.arch.gotsym;
-	lgotno = m->dyn.arch.lgotno;
-
-	DPRINTF("** Relocate GOT entries **\n");
-	DPRINTF("MIPS base = 0x%x\n", m->dyn.arch.base);
-
-	/*
-	 * Local entries.
-	 */
-	for (i = 0; i < gotsym; i++) {
-		/* FIXME: really subtract MIPS base? */
-		got[i] += m->bias - m->dyn.arch.base;
-	}
-
-	DPRINTF("sym_ent = %d, gotsym = %d\n", m->dyn.arch.sym_no, gotsym);
-	DPRINTF("lgotno = %d\n", lgotno);
-
-	/*
-	 * Iterate over GOT-mapped symbol entries.
-	 */
-	for (j = gotsym; j < m->dyn.arch.sym_no; j++) {
-		/* Corresponding (global) GOT entry. */
-		i = lgotno + j - gotsym;
-
-		DPRINTF("relocate GOT entry %d\n", i);
-//		getchar();
-//		getchar();
-
-		sym = &sym_table[j];
-		if (ELF32_R_TYPE(sym->st_info) == STT_FUNC) {
-			if (sym->st_shndx == SHN_UNDEF) {
-				if (sym->st_value == 0) {
-					/* 1 */
-				} else {
-					if (got[i] == sym->st_value) {
-						/* 2 */
-						DPRINTF("(2)\n");
-						got[i] += m->bias - m->dyn.arch.base;
-						continue;
-					} else {
-						/* 3 */
-						DPRINTF("(3)\n");
-						got[i] = sym->st_value + m->bias - m->dyn.arch.base;
-						continue;
-					}
-				}
-			} else {
-				/* 2 */
-				DPRINTF("(2)\n");
-				got[i] += m->bias - m->dyn.arch.base;
-				continue;
-			}
-		} else {
-			if (sym->st_shndx == SHN_UNDEF ||
-			    sym->st_shndx == SHN_COMMON) {
-				/* 1 */
-			} else {
-				/* 1 */
-			}
-		}
-		
-		DPRINTF("(1) symbol name='%s'\n", str_tab + sym->st_name);
-		sym_def = symbol_def_find(str_tab + sym->st_name, m, &dest);
-		if (sym_def) {
-			sym_addr = (uintptr_t) symbol_get_addr(sym_def, dest);
-			DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
-		} else {
-			DPRINTF("symbol definition not found\n");
-			continue;
-		}
-		DPRINTF("write 0x%x at 0x%x\n", sym_addr, (uint32_t) &got[i]);
-		got[i] = sym_addr;
-	}
-
-	DPRINTF("** Done **\n");
-}
-
-/**
- * Process (fixup) all relocations in a relocation table.
- */
-void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size)
-{
-	unsigned i;
-
-	size_t rt_entries;
-	size_t r_offset;
-	elf_word r_info;
-	unsigned rel_type;
-	elf_word sym_idx;
-	uintptr_t sym_addr;
-	
-	elf_symbol_t *sym_table;
-	elf_symbol_t *sym;
-	uint32_t *r_ptr;
-/*	uint16_t *r_ptr16;*/
-	char *str_tab;
-	
-	elf_symbol_t *sym_def;
-	module_t *dest;
-
-	uint32_t *got;
-	uint32_t gotsym;
-	uint32_t lgotno;
-	uint32_t ea;
-
-	DPRINTF("parse relocation table\n");
-
-	sym_table = m->dyn.sym_tab;
-	rt_entries = rt_size / sizeof(elf_rela_t);
-	str_tab = m->dyn.str_tab;
-	got = (uint32_t *) m->dyn.plt_got;
-	gotsym = m->dyn.arch.gotsym;
-	lgotno = m->dyn.arch.lgotno;
-
-	DPRINTF("got=0x%x, gotsym=%d\n", (uintptr_t) got, gotsym);
-
-	DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
-	
-	for (i = 0; i < rt_entries; ++i) {
-		DPRINTF("symbol %d: ", i);
-		r_offset = rt[i].r_offset;
-		r_info = rt[i].r_info;
-
-		sym_idx = ELF32_R_SYM(r_info);
-		sym = &sym_table[sym_idx];
-
-		DPRINTF("name '%s', value 0x%x, size 0x%x\n",
-		    str_tab + sym->st_name,
-		    sym->st_value,
-		    sym->st_size);
-
-		rel_type = ELF32_R_TYPE(r_info);
-		r_ptr = (uint32_t *)(r_offset + m->bias);
-		/*r_ptr16 = (uint16_t *)(r_offset + m->bias);*/
-
-		if (sym->st_name != 0) {
-			DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
-			DPRINTF("dest name: '%s'\n", dest->dyn.soname);
-			DPRINTF("dest bias: 0x%x\n", dest->bias);
-			if (sym_def) {
-				sym_addr = (uintptr_t) symbol_get_addr(sym_def,
-				    dest);
-				DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
-			} else {
-				DPRINTF("symbol definition not found\n");
-				continue;
-			}
-		} else {
-			sym_def = NULL;
-			sym_addr = 0;
-		}
-
-		DPRINTF("switch(%u)\n", rel_type);
-
-		switch (rel_type) {
-		case R_MIPS_NONE:
-			DPRINTF("Ignoring R_MIPS_NONE\n");
-			break;
-
-		case R_MIPS_REL32:
-			DPRINTF("fixup R_MIPS_REL32 (r - ea + s)\n");
-			if (sym_idx < gotsym)
-				ea = sym_addr;
-			else
-				ea = got[lgotno + sym_idx - gotsym];
-
-			*r_ptr += sym_addr - ea;
-			DPRINTF("p = 0x%x, val := 0x%x\n", (uint32_t) r_ptr,
-			    *r_ptr);
-//			getchar();
-			break;
-
-		/* No other non-TLS relocation types should appear. */
-
-		case R_MIPS_TLS_DTPMOD32:
-			/*
-			 * We can ignore this as long as the only module
-			 * with TLS variables is libc.so.
-			 */
-			DPRINTF("Ignoring R_MIPS_DTPMOD32\n");
-			break;
-
-		default:
-			printf("Error: Unknown relocation type %d.\n",
-			    rel_type);
-			exit(1);
-			break;
-		}
-	}
-
-
-	printf("relocation done\n");
-}
-
-void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size)
-{
-	/* Unused */
-	(void)m; (void)rt; (void)rt_size;
-}
-
-/** @}
- */
Index: pace/lib/c/arch/ppc32/include/rtld/dynamic.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/rtld/dynamic.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
+++ 	(revision )
@@ -1,47 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libcppc32
- * @{
- */
-/** @file
- */
-
-#ifndef LIBC_ppc32_RTLD_DYNAMIC_H_
-#define LIBC_ppc32_RTLD_DYNAMIC_H_
-
-#include <sys/types.h>
-
-typedef struct {
-	/* Empty. */
-} dyn_info_arch_t;
-
-#endif
-
-/** @}
- */
Index: pace/lib/c/arch/ppc32/include/rtld/elf_dyn.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/rtld/elf_dyn.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
+++ 	(revision )
@@ -1,56 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libcppc32
- * @{
- */
-/** @file
- */
-
-#ifndef LIBC_ppc32_RTLD_ELF_DYN_H_
-#define LIBC_ppc32_RTLD_ELF_DYN_H_
-
-/*
- * ppc32 dynamic relocation types
- */
-
-#define R_PPC_ADDR32	1
-#define R_PPC_ADDR16_LO	4
-#define R_PPC_ADDR16_HI	5
-#define R_PPC_ADDR16_HA	6
-#define R_PPC_REL24	10
-#define R_PPC_COPY	19
-#define R_PPC_JMP_SLOT	21
-#define R_PPC_RELATIVE	22
-
-#define R_PPC_DTPMOD32	68
-
-#endif
-
-/** @}
- */
Index: pace/lib/c/arch/ppc32/src/rtld/dynamic.c
===================================================================
--- uspace/lib/c/arch/ppc32/src/rtld/dynamic.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
+++ 	(revision )
@@ -1,51 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libcppc32
- * @brief
- * @{
- */
-/**
- * @file
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <elf_dyn.h>
-#include <dynamic.h>
-
-void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info)
-{
-	(void) dp;
-	(void) bias;
-	(void) info;
-}
-
-/** @}
- */
Index: pace/lib/c/arch/ppc32/src/rtld/reloc.c
===================================================================
--- uspace/lib/c/arch/ppc32/src/rtld/reloc.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
+++ 	(revision )
@@ -1,300 +1,0 @@
-/*
- * Copyright (c) 2008 Jiri Svoboda
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libcppc32
- * @brief
- * @{
- */
-/**
- * @file
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <elf_dyn.h>
-#include <symbol.h>
-#include <rtld.h>
-#include <rtld_debug.h>
-#include <smc.h>
-
-#include <rtld_arch.h>
-
-#define __L(ptr) ((uint32_t)(ptr) & 0x0000ffff)
-#define __HA(ptr) ((uint32_t)(ptr) >> 16)
-
-// ldis r11, .PLTtable@ha
-static inline uint32_t _ldis(unsigned rD, uint16_t imm16)
-{
-	/* Special case of addis: ldis rD,SIMM == addis rD,0,SIMM */
-	return 0x3C000000 | (rD << 21) | imm16;
-}
-
-static inline uint32_t _lwz(unsigned rD, uint16_t disp16, unsigned rA)
-{
-	return 0x80000000 | (rD << 21) | (rA << 16) | disp16;
-}
-
-static inline uint32_t _mtctr(unsigned rS)
-{
-	/* mtctr rD == mtspr 9, rD */
-	return 0x7c0003a6 | (rS << 21) | (9/*CTR*/ << 16);
-}
-
-static inline uint32_t _bctr()
-{
-	/* bcctr 0x1f, 0 */
-	return 0x4c000420 | (0x1f/*always*/ << 21);
-}
-
-/* branch */
-static inline uint32_t _b(uint32_t *addr, uint32_t *location)
-{
-	uint32_t raddr = ((uint32_t)addr - (uint32_t)location) & 0x03fffffc;
-	return 0x48000000 | raddr;
-}
-
-
-/*
- * Fill in PLT
- */
-void module_process_pre_arch(module_t *m)
-{
-	uint32_t *plt;
-//	uint32_t *_plt_ent;
-	
-	/* No lazy linking -- no pre-processing yet. */
-	return;
-
-	plt = m->dyn.plt_got;
-	if (!plt) {
-		/* Module has no PLT */
-		return;
-	}
-
-	// PLT entries start here. However, each occupies 2 words
-//	_plt_ent = plt + 18;
-
-	// By definition of the ppc ABI, there's 1:1 correspondence
-	// between JMPREL entries and PLT entries
-	unsigned plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
-
-	uint32_t *_plt_table;
-//	uint32_t *_plt_call;
-//	uint32_t *_plt_resolve;
-
-//	_plt_resolve = plt;
-//	_plt_call = plt + 6;
-	_plt_table = plt + 18 + plt_n;
-
-/* .PLTcall: */
-	plt[6] = _ldis(11, __HA(_plt_table));	// ldis r11, .PLTtable@ha
-	plt[7] = _lwz(11, __L(_plt_table), 11);	// lwz r11, .PLTtable@l(r11)
-	plt[8] = _mtctr(11);			// mtctr r11
-	plt[9] = _bctr();
-
-/* .PLTi, i = 0..N-1 */
-//	kputint(-4);
-/*	for (i = 0; i < plt_n; ++i) {
-		//_plt_table[i] == function address;
-		plt[18+i] = _b(_plt_call, &plt[18+i]);	// b .PLTcall
-	}*/
-}
-
-void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size)
-{
-	/* Unused */
-	(void)m; (void)rt; (void)rt_size;
-}
-
-/**
- * Process (fixup) all relocations in a relocation table.
- */
-void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size)
-{
-	unsigned i;
-
-	size_t rt_entries;
-	size_t r_offset;
-	elf_word r_info;
-	unsigned rel_type;
-	elf_word sym_idx;
-	uintptr_t sym_addr;
-	uintptr_t r_addend;
-	
-	elf_symbol_t *sym_table;
-	elf_symbol_t *sym;
-	uint32_t *r_ptr;
-	uint16_t *r_ptr16;
-	char *str_tab;
-	
-	elf_symbol_t *sym_def;
-	module_t *dest;
-
-	uint32_t *plt;
-//	uint32_t *_plt_table;
-	uint32_t *_plt_ent;
-	uint32_t plt_n;
-	uint32_t pidx;
-	uint32_t t_addr;
-	uint32_t sym_size;
-
-	plt = m->dyn.plt_got;
-	plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
-	_plt_ent = plt+ 18;
-//	_plt_table = plt + 18 + plt_n;
-
-	DPRINTF("parse relocation table\n");
-
-	sym_table = m->dyn.sym_tab;
-	rt_entries = rt_size / sizeof(elf_rela_t);
-	str_tab = m->dyn.str_tab;
-
-	DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
-	
-	for (i = 0; i < rt_entries; ++i) {
-		DPRINTF("symbol %d: ", i);
-		r_offset = rt[i].r_offset;
-		r_info = rt[i].r_info;
-		r_addend = rt[i].r_addend;
-
-		sym_idx = ELF32_R_SYM(r_info);
-		sym = &sym_table[sym_idx];
-
-		DPRINTF("name '%s', value 0x%x, size 0x%x\n",
-		    str_tab + sym->st_name,
-		    sym->st_value,
-		    sym->st_size);
-
-		rel_type = ELF32_R_TYPE(r_info);
-		r_ptr = (uint32_t *)(r_offset + m->bias);
-		r_ptr16 = (uint16_t *)(r_offset + m->bias);
-
-		if (sym->st_name != 0) {
-			DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
-			sym_def = symbol_def_find(str_tab + sym->st_name,
-			    m, &dest);
-			DPRINTF("dest name: '%s'\n", dest->dyn.soname);
-			DPRINTF("dest bias: 0x%x\n", dest->bias);
-			if (sym_def) {
-				sym_addr = (uintptr_t) symbol_get_addr(
-				    sym_def, dest);
-				DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
-			} else {
-				DPRINTF("symbol definition not found\n");
-				continue;
-			}
-		} else {
-			sym_def = NULL;
-			sym_addr = 0;
-		}
-
-		switch (rel_type) {
-		case R_PPC_ADDR16_LO:
-			DPRINTF("fixup R_PPC_ADDR16_LO (#lo(s+a))\n");
-			*r_ptr16 = (sym_addr + r_addend) & 0xffff;
-			break;
-
-		case R_PPC_ADDR16_HI:
-			DPRINTF("fixup R_PPC_ADDR16_HI (#hi(s+a))\n");
-			*r_ptr16 = (sym_addr + r_addend) >> 16;
-			break;
-
-		case R_PPC_ADDR16_HA:
-			DPRINTF("fixup R_PPC_ADDR16_HA (#ha(s+a))\n");
-			t_addr = sym_addr + r_addend;
-			*r_ptr16 = (t_addr >> 16) + ((t_addr & 0x8000) ? 1 : 0);
-			break;
-
-		case R_PPC_JMP_SLOT:
-			DPRINTF("fixup R_PPC_JMP_SLOT (b+v)\n");
-			pidx = (r_ptr - _plt_ent) / 2;
-			if (pidx >= plt_n) {
-				DPRINTF("error: proc index out of range\n");
-				exit(1);
-			}
-			plt[18+2*pidx] = _b((void *)sym_addr, &plt[18+2*pidx]);
-			break;
-
-		case R_PPC_ADDR32:
-			DPRINTF("fixup R_PPC_ADDR32 (b+v+a)\n");
-			*r_ptr = r_addend + sym_addr;
-			break;
-
-		case R_PPC_COPY:
-			/*
-			 * Copy symbol data from shared object to specified
-			 * location.
-			 */
-			DPRINTF("fixup R_PPC_COPY (s)\n");
-
-			sym_size = sym->st_size;
-			if (sym_size != sym_def->st_size) {
-				printf("warning: mismatched symbol sizes\n");
-				/* Take the lower value. */
-				if (sym_size > sym_def->st_size)
-					sym_size = sym_def->st_size;
-			}
-			memcpy(r_ptr, (const void *)sym_addr, sym_size);
-			break;
-			
-		case R_PPC_RELATIVE:
-			DPRINTF("fixup R_PPC_RELATIVE (b+a)\n");
-			*r_ptr = r_addend + m->bias;
-			break;
-
-		case R_PPC_REL24:
-			DPRINTF("fixup R_PPC_REL24 (s+a-p)>>2\n");
-			*r_ptr = (sym_addr + r_addend - (uint32_t)r_ptr) >> 2;
-			break;
-
-		case R_PPC_DTPMOD32:
-			/*
-			 * We can ignore this as long as the only module
-			 * with TLS variables is libc.so.
-			 */
-			DPRINTF("Ignoring R_PPC_DTPMOD32\n");
-			break;
-
-		default:
-			printf("Error: Unknown relocation type %d.\n",
-			    rel_type);
-			exit(1);
-			break;
-		}
-	}
-
-	/*
-	 * Synchronize the used portion of PLT. This is necessary since
-	 * we are writing instructions.
-	 */
-	smc_coherence(&plt[18], plt_n * 2 * sizeof(uint32_t));
-}
-
-/** @}
- */
