Print this page
10925 remove 32-bit krtld
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
*** 21,34 ****
/*
* Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
*/
! #if defined(_KERNEL)
! #include <sys/types.h>
! #include "reloc.h"
! #else
#define ELF_TARGET_386
#if defined(DO_RELOC_LIBLD)
#undef DO_RELOC_LIBLD
#define DO_RELOC_LIBLD_X86
#endif
--- 21,40 ----
/*
* Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
*/
! /*
! * Copyright 2019 Joyent, Inc.
! */
!
! /*
! * While this is no longer relevant to the kernel, we keep it in its
! * traditional location to match the other variants, used from the ld
! * code.
! */
!
#define ELF_TARGET_386
#if defined(DO_RELOC_LIBLD)
#undef DO_RELOC_LIBLD
#define DO_RELOC_LIBLD_X86
#endif
*** 37,47 ****
#include "machdep.h"
#include "libld.h"
#include "reloc.h"
#include "conv.h"
#include "msg.h"
- #endif
/*
* We need to build this code differently when it is used for
* cross linking:
* - Data alignment requirements can differ from those
--- 43,52 ----
*** 179,194 ****
*
* The calculations in the CALCULATION column are assumed to have
* been performed before calling this function except for the addition of
* the addresses in the instructions.
*/
! #if defined(_KERNEL)
! #define lml 0 /* Needed by arglist of REL_ERR_* macros */
! int
! do_reloc_krtld(uchar_t rtype, uchar_t *off, Xword *value, const char *sym,
! const char *file)
! #elif defined(DO_RELOC_LIBLD)
/*ARGSUSED5*/
int
do_reloc_ld(Rel_desc *rdesc, uchar_t *off, Xword *value,
rel_desc_sname_func_t rel_desc_sname_func,
const char *file, int bswap, void *lml)
--- 184,194 ----
*
* The calculations in the CALCULATION column are assumed to have
* been performed before calling this function except for the addition of
* the addresses in the instructions.
*/
! #if defined(DO_RELOC_LIBLD)
/*ARGSUSED5*/
int
do_reloc_ld(Rel_desc *rdesc, uchar_t *off, Xword *value,
rel_desc_sname_func_t rel_desc_sname_func,
const char *file, int bswap, void *lml)