diff options
| author |   miod <miod@openbsd.org> | 2013-02-02 13:38:41 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2013-02-02 13:38:41 +0000 |
| commit | ab02b1a8e4a053d384ef84b1ba2f4410b41f2d60 (patch) | |
| tree | d061a485da284aad3ccc67a66d07679da9756ccf | |
| parent | Compile stdexcepti.cc with -O0 on m68k when compiling it -fPIC to avoid an ICE (diff) | |
| download | wireguard-openbsd-ab02b1a8e4a053d384ef84b1ba2f4410b41f2d60.tar.xz wireguard-openbsd-ab02b1a8e4a053d384ef84b1ba2f4410b41f2d60.zip | |
m68k ports are now ELF citizens.
| -rw-r--r-- | Makefile.cross | 4 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/Makefile.cross b/Makefile.cross index 4c2b78de93f..31ffcf92ef3 100644 --- a/Makefile.cross +++ b/Makefile.cross @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.59 2013/01/05 11:20:52 miod Exp $ +# $OpenBSD: Makefile.cross,v 1.60 2013/02/02 13:38:41 miod Exp $ cross-tools: cross-includes cross-binutils cross-gcc cross-lib cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var @@ -88,7 +88,7 @@ CROSSGCC= ${CROSSDIR}/.gcc_done .include <bsd.own.mk> -OLD_BINUTILS_ARCH=m68k vax +OLD_BINUTILS_ARCH=vax .for _arch in ${TARGET_ARCH} .if !empty(GCC2_ARCH:M${_arch}) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index bdeb1fe5d06..39c9c168739 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.134 2013/01/31 23:35:02 miod Exp $ +# $OpenBSD: bsd.own.mk,v 1.135 2013/02/02 13:38:41 miod Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -22,7 +22,7 @@ TCP_WRAPPERS?= yes # Set `DEBUGLIBS' to `yes' to build libraries with debugging symbols DEBUGLIBS?= no # Set toolchain to be able to know differences. -.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "vax" +.if ${MACHINE_ARCH} == "vax" ELF_TOOLCHAIN?= no .else ELF_TOOLCHAIN?= yes @@ -149,13 +149,6 @@ NOPIC= PICFLAG?=-fPIC .else PICFLAG?=-fpic -. if ${MACHINE_ARCH} == "m68k" -# Function CSE makes gas -k not recognize external function calls as lazily -# resolvable symbols, thus sometimes making ld.so report undefined symbol -# errors on symbols found in shared library members that would never be -# called. Ask niklas@openbsd.org for details. -PICFLAG+=-fno-function-cse -. endif .endif .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" |