diff options
| author | Peter Valchev <pvalchev@cvs.openbsd.org> | 2004-06-22 19:50:02 +0000 |
|---|---|---|
| committer | Peter Valchev <pvalchev@cvs.openbsd.org> | 2004-06-22 19:50:02 +0000 |
| commit | 259c049085f9638d60da0030cac7b7f46fb00675 (patch) | |
| tree | 3a9f49324b032a905dee33d4e27c7f7177006d33 /share | |
| parent | 7ac3abf53bfceb3ddbff62e06cccca6204cb7709 (diff) | |
move PICFLAG into bsd.own.mk where the rest of the lib stuff is
(don't ask why) and simplify logic; needed soon
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.lib.mk | 13 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 14 |
2 files changed, 13 insertions, 14 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 2911b2134d5..8d14febfb94 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.37 2004/02/01 06:02:13 drahn Exp $ +# $OpenBSD: bsd.lib.mk,v 1.38 2004/06/22 19:50:01 pvalchev Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -117,17 +117,6 @@ CXXFLAGS+= ${CXXDIAGFLAGS} CFLAGS+= ${COPTS} CXXFLAGS+= ${CXXOPTS} -.if !defined(PICFLAG) && (${MACHINE_ARCH} != "mips") -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 - _LIBS=lib${LIB}.a .if (${DEBUGLIBS:L} == "yes") _LIBS+=lib${LIB}_g.a diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 900ac903922..2b226359fbf 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.83 2004/06/01 20:43:44 mickey Exp $ +# $OpenBSD: bsd.own.mk,v 1.84 2004/06/22 19:50:01 pvalchev Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -116,10 +116,20 @@ STATIC?= -static NOPIC= .endif -#pic relocation flags. +# pic relocation flags. .if (${MACHINE_ARCH} == "sparc64") 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} == "sparc64") || (${MACHINE_ARCH} == "sparc") ASPICFLAG=-KPIC .elif (${ELF_TOOLCHAIN:L} == "no") |