Drop old powerpc flags from the build of clang

Drop NOPIE_FLAGS = -fPIE and change CFLAGS on powerpc to be the same
as on other arches.

ok deraadt@ kettenis@

diff --git a/gnu/usr.bin/clang/Makefile.inc b/gnu/usr.bin/clang/Makefile.inc
index 5c16e10..1453b5e 100644 (file)
--- a/gnu/usr.bin/clang/Makefile.inc
+++ b/gnu/usr.bin/clang/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.25 2021/08/21 03:00:02 gkoehler Exp $
+# $OpenBSD: Makefile.inc,v 1.26 2022/05/12 15:51:23 gkoehler Exp $
 
 CLANG_SRCS?=   ${.CURDIR}/../../../llvm/clang
 LLDB_SRCS?=    ${.CURDIR}/../../../llvm/lldb
@@ -41,11 +41,6 @@ CXXFLAGS+=   -mno-retpoline
 CXXFLAGS+=     -fomit-frame-pointer
 .endif
 
-# Compiling with -fno-pie doesn't work on powerpc.
-.if ${MACHINE_ARCH} == "powerpc"
-NOPIE_FLAGS=   -fPIE
-.endif
-
 CPPFLAGS+=     -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS \
                -D__STDC_FORMAT_MACROS
 
@@ -58,11 +53,7 @@ CPPFLAGS+=   -DLLVM_PREFIX=\"/usr\"
 .include "Makefile.arch"
 
 # upstream defaults
-CFLAGS+=       -ffunction-sections
-.if ${MACHINE_ARCH} != "powerpc"
-# XXX
-CFLAGS+=       -fdata-sections
-.endif
+CFLAGS+=       -ffunction-sections -fdata-sections
 CXXFLAGS+=     -std=c++14
 CXXFLAGS+=     -fvisibility-inlines-hidden
 CXXFLAGS+=     -fno-exceptions -fno-rtti