diff options
author | Mark Adler <fork@madler.net> | 2022-10-10 02:40:53 -0700 |
---|---|---|
committer | Mark Adler <fork@madler.net> | 2022-10-10 10:30:22 -0700 |
commit | 29fd715fd0bdaffee21e2d2d37be8c5a6ac67ee4 (patch) | |
tree | fbd78d6a3e16b09d14a042babc4a476d07f967ad | |
parent | 40c5a9bc06c5b0746aab270971c8cc546e3d5fc7 (diff) | |
download | zlib-29fd715fd0bdaffee21e2d2d37be8c5a6ac67ee4.tar.gz zlib-29fd715fd0bdaffee21e2d2d37be8c5a6ac67ee4.tar.bz2 zlib-29fd715fd0bdaffee21e2d2d37be8c5a6ac67ee4.zip |
Turn off RWX segment warnings on sparc systems.
-rw-r--r-- | Makefile.in | 6 | ||||
-rwxr-xr-x | configure | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 1cc9f4d..2dedc44 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -22,7 +22,7 @@ CFLAGS=-O | |||
22 | 22 | ||
23 | SFLAGS=-O | 23 | SFLAGS=-O |
24 | LDFLAGS= | 24 | LDFLAGS= |
25 | TEST_LDFLAGS=-L. libz.a | 25 | TEST_LDFLAGS=$(LDFLAGS) -L. libz.a |
26 | LDSHARED=$(CC) | 26 | LDSHARED=$(CC) |
27 | CPP=$(CC) -E | 27 | CPP=$(CC) -E |
28 | 28 | ||
@@ -288,10 +288,10 @@ minigzip$(EXE): minigzip.o $(STATICLIB) | |||
288 | $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) | 288 | $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) |
289 | 289 | ||
290 | examplesh$(EXE): example.o $(SHAREDLIBV) | 290 | examplesh$(EXE): example.o $(SHAREDLIBV) |
291 | $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV) | 291 | $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV) |
292 | 292 | ||
293 | minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) | 293 | minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) |
294 | $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV) | 294 | $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV) |
295 | 295 | ||
296 | example64$(EXE): example64.o $(STATICLIB) | 296 | example64$(EXE): example64.o $(STATICLIB) |
297 | $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) | 297 | $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) |
@@ -33,7 +33,10 @@ fi | |||
33 | # set command prefix for cross-compilation | 33 | # set command prefix for cross-compilation |
34 | if [ -n "${CHOST}" ]; then | 34 | if [ -n "${CHOST}" ]; then |
35 | uname=${CHOST} | 35 | uname=${CHOST} |
36 | mname=${CHOST} | ||
36 | CROSS_PREFIX="${CHOST}-" | 37 | CROSS_PREFIX="${CHOST}-" |
38 | else | ||
39 | mname=`(uname -a || echo unknown) 2>/dev/null` | ||
37 | fi | 40 | fi |
38 | 41 | ||
39 | # destination name for static library | 42 | # destination name for static library |
@@ -220,6 +223,10 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then | |||
220 | fi | 223 | fi |
221 | case "$uname" in | 224 | case "$uname" in |
222 | Linux* | linux* | *-linux* | GNU | GNU/* | solaris*) | 225 | Linux* | linux* | *-linux* | GNU | GNU/* | solaris*) |
226 | case "$mname" in | ||
227 | *sparc*) | ||
228 | LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;; | ||
229 | esac | ||
223 | LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;; | 230 | LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;; |
224 | *BSD | *bsd* | DragonFly) | 231 | *BSD | *bsd* | DragonFly) |
225 | LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} | 232 | LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} |