diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2023-03-20 11:52:36 +0100 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2023-03-20 11:53:05 +0100 |
| commit | f7d3d88caa1cb439dc43ed46b6d780f50fc0e854 (patch) | |
| tree | f192e336f3c05e31c0bb22ce4852c0891626dd83 /security/cryptlib/files/patch-tools_ccopts.sh | |
| parent | net/haproxy-devel: update to 2.8-dev5 (diff) | |
security/cryptlib: update to 3.4.6 release.
Diffstat (limited to 'security/cryptlib/files/patch-tools_ccopts.sh')
| -rw-r--r-- | security/cryptlib/files/patch-tools_ccopts.sh | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/security/cryptlib/files/patch-tools_ccopts.sh b/security/cryptlib/files/patch-tools_ccopts.sh index e1b43d127496..f0c1781caf8f 100644 --- a/security/cryptlib/files/patch-tools_ccopts.sh +++ b/security/cryptlib/files/patch-tools_ccopts.sh @@ -1,11 +1,20 @@ ---- tools/ccopts.sh.orig 2010-12-19 00:57:12.000000000 +0100 -+++ tools/ccopts.sh 2011-03-04 15:33:54.000000000 +0100 -@@ -341,22 +341,6 @@ fi - # in situations that also use shared libs, in the case of x86-64 the use - # of PIC should have minimum overhead so it shouldn't be a big deal. +--- tools/ccopts.sh.orig 2021-10-21 02:27:26 UTC ++++ tools/ccopts.sh +@@ -892,31 +892,6 @@ fi + # a big deal. As a convenient side-effect, this also enables the use of + # ASLR where it's supported. --if [ "$ARCH" = "i586" -o "$ARCH" = "i686" -o "$ARCH" = "x86_64" ] ; then -- if [ "$GCC_VER" -ge 30 ] ; then +-if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ] || [ "$ARCH" = "x86_64" ] ; then +- if [ "$COMPILER_VER" -ge 45 ] ; then +- if [ $GENERICBUILD -gt 0 ] ; then +- echo " (Enabling lowest-common-denominator build options for cross-platform library)." >&2 ; +- else +- CCARGS="$CCARGS -march=native -mtune=generic" ; +- fi +- if [ "$ARCH" = "x86_64" ] ; then +- CCARGS="$CCARGS -fPIC" ; +- fi ; +- elif [ "$COMPILER_VER" -ge 30 ] ; then - case $ARCH in - 'x86_64') - CCARGS="$CCARGS -march=opteron -fPIC" ;; |