diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-12 20:04:55 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-12 20:04:55 +0000 |
| commit | e05151fe94cab0a7dc5ad34479ec06784b131e7f (patch) | |
| tree | 65e96bb4de40443cb65efbd1ee51167493fea0a1 /gnu | |
| parent | 05ed34df71d732eee18acc4be9cbdbc95f2f8d4f (diff) | |
Simplify cross-compilation scenario; native builds unaffected.
Looked at mickey@ grange@
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/ld/Makefile | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/m68k/md.h | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/m88k/md.h | 9 |
3 files changed, 7 insertions, 22 deletions
diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile index 4e477fdb00d..8bcc4442975 100644 --- a/gnu/usr.bin/ld/Makefile +++ b/gnu/usr.bin/ld/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2004/03/31 19:05:37 mickey Exp $ +# $OpenBSD: Makefile,v 1.12 2005/09/12 20:04:50 miod Exp $ # $NetBSD: Makefile,v 1.13 1995/04/23 07:58:46 cgd Exp $ TARGET_MACHINE_ARCH?= $(MACHINE_ARCH) @@ -14,12 +14,12 @@ ld.o: .if ($(TARGET_MACHINE_ARCH) != $(MACHINE_ARCH)) CPPFLAGS+= -DCROSS_LINKER -DXHOST=$(MACHINE_ARCH) \ - -idirafter cross-include -U__ELF__ + -Icross-include -U__ELF__ beforedepend: mkdir -p cross-include - -rm cross-include/${TARGET_MACHINE_ARCH} - -rm cross-include/${TARGET} - -rm cross-include/machine + rm -f cross-include/${TARGET_MACHINE_ARCH} + rm -f cross-include/${TARGET} + rm -f cross-include/machine ln -sf ${.CURDIR}/../../../sys/arch/${TARGET_MACHINE_ARCH}/include \ cross-include/${TARGET_MACHINE_ARCH} ln -sf ${.CURDIR}/../../../sys/arch/${TARGET}/include \ diff --git a/gnu/usr.bin/ld/m68k/md.h b/gnu/usr.bin/ld/m68k/md.h index 911e525b113..58bd32910d5 100644 --- a/gnu/usr.bin/ld/m68k/md.h +++ b/gnu/usr.bin/ld/m68k/md.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: md.h,v 1.7 2002/09/20 19:54:11 deraadt Exp $*/ +/* * $OpenBSD: md.h,v 1.8 2005/09/12 20:04:53 miod Exp $*/ /* * - m68k dependent definitions */ @@ -10,16 +10,8 @@ #define NEED_SWAP #endif -#undef __LDPGSZ -#undef ELF_TARG_DATA -#undef ELF_TARG_MACH -#undef relocation_info -#undef MID_MACHINE -#define MID_MACHINE MID_M68K -#include <m68k/exec.h> #endif - #define MAX_ALIGNMENT (sizeof (long)) #define PAGSIZ __LDPGSZ diff --git a/gnu/usr.bin/ld/m88k/md.h b/gnu/usr.bin/ld/m88k/md.h index f997e55ebd1..2a02463f760 100644 --- a/gnu/usr.bin/ld/m88k/md.h +++ b/gnu/usr.bin/ld/m88k/md.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: md.h,v 1.6 2002/07/17 20:33:29 marc Exp $*/ +/* * $OpenBSD: md.h,v 1.7 2005/09/12 20:04:54 miod Exp $*/ /* * - m88k dependent definitions */ @@ -10,13 +10,6 @@ #define NEED_SWAP #endif -#undef __LDPGSZ -#undef ELF_TARG_DATA -#undef ELF_TARG_MACH -#undef relocation_info -#undef MID_MACHINE -#define MID_MACHINE MID_M88K -#include <mvme88k/exec.h> #endif #define MAX_ALIGNMENT (sizeof (double)) |