diff options
| -rwxr-xr-x[-rw-r--r--] | scp2/source/ooo/file_ooo.scp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | solenv/config/sdev300.ini | 0 | ||||
| -rw-r--r-- | solenv/inc/unxlng.mk | 3 |
3 files changed, 1 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a600c135d..a600c135d 100644..100755 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 3e80e1460..3e80e1460 100755..100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index be8c5d01b..45fa08734 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -153,8 +153,7 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$O LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= -# flag -Wl,-z,noexecstack sets the NX bit on the stack -LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo .ENDIF |