equal
deleted
inserted
replaced
|
1 --- /tmp/Makefile.shared Mon Feb 14 14:33:05 2011 |
|
2 +++ openssl-1.0.0d/Makefile.shared Mon Feb 14 14:35:56 2011 |
|
3 @@ -389,6 +389,7 @@ |
|
4 SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ |
|
5 fi; \ |
|
6 $(LINK_SO_A) |
|
7 +# Make sure the apps have non-executable stacks and data (x86/x64 only). |
|
8 link_app.solaris: |
|
9 @ if $(DETECT_GNU_LD); then \ |
|
10 $(DO_GNU_APP); \ |
|
11 @@ -395,6 +396,10 @@ |
|
12 else \ |
|
13 LDFLAGS="$(CFLAGS)"; \ |
|
14 fi; \ |
|
15 + if expr $(PLATFORM) : '.*x86.*' > /dev/null; then \ |
|
16 + LDFLAGS="$${LDFLAGS} -M/usr/lib/ld/map.noexdata"; \ |
|
17 + fi; \ |
|
18 + LDFLAGS="$${LDFLAGS} -M/usr/lib/ld/map.noexstk -M/usr/lib/ld/map.pagealign"; \ |
|
19 $(LINK_APP) |
|
20 |
|
21 # OpenServer 5 native compilers used |