From 7752022b41126310b0ca3a9d50ad876b8ca17591 Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov Date: Sun, 14 Oct 2018 09:43:08 +0300 Subject: 9895 gfx-drm is broken again Reviewed by: Olaf Bohlen --- usr/src/Makefile.master | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 397e684..6b0f013 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -854,30 +854,31 @@ CCMT= -mt # Handle different PIC models on different ISAs # (May be overridden by lower-level Makefiles) -sparc_C_PICFLAGS = -K pic -sparcv9_C_PICFLAGS = -K pic -i386_C_PICFLAGS = -K pic -amd64_C_PICFLAGS = -K pic +sparc_C_PICFLAGS = -fpic +sparcv9_C_PICFLAGS = -fpic +i386_C_PICFLAGS = -fpic +amd64_C_PICFLAGS = -fpic C_PICFLAGS = $($(MACH)_C_PICFLAGS) C_PICFLAGS64 = $($(MACH64)_C_PICFLAGS) -sparc_C_BIGPICFLAGS = -K PIC -sparcv9_C_BIGPICFLAGS = -K PIC -i386_C_BIGPICFLAGS = -K PIC -amd64_C_BIGPICFLAGS = -K PIC +sparc_C_BIGPICFLAGS = -fPIC +sparcv9_C_BIGPICFLAGS = -fPIC +i386_C_BIGPICFLAGS = -fPIC +amd64_C_BIGPICFLAGS = -fPIC C_BIGPICFLAGS = $($(MACH)_C_BIGPICFLAGS) C_BIGPICFLAGS64 = $($(MACH64)_C_BIGPICFLAGS) # CC requires there to be no space between '-K' and 'pic' or 'PIC'. -sparc_CC_PICFLAGS = -Kpic -sparcv9_CC_PICFLAGS = -KPIC -i386_CC_PICFLAGS = -Kpic -amd64_CC_PICFLAGS = -Kpic +# and does not support -f +sparc_CC_PICFLAGS = -_cc=-Kpic -_gcc=-fpic +sparcv9_CC_PICFLAGS = -_cc=-KPIC -_gcc=-fPIC +i386_CC_PICFLAGS = -_cc=-Kpic -_gcc=-fpic +amd64_CC_PICFLAGS = -_cc=-Kpic -_gcc=-fpic CC_PICFLAGS = $($(MACH)_CC_PICFLAGS) CC_PICFLAGS64 = $($(MACH64)_CC_PICFLAGS) -AS_PICFLAGS= $(C_PICFLAGS) -AS_BIGPICFLAGS= $(C_BIGPICFLAGS) +AS_PICFLAGS= -K pic +AS_BIGPICFLAGS= -K PIC # # Default label for CTF sections -- cgit v1.2.3