Skip to content

Commit 8f12a4e

Browse files
committed
aix: Remove checks for very old OS versions
Reviewed-By: Thomas Munro <thomas.munro@gmail.com> Discussion: https://postgr.es/m/20220807012914.ydz73yte6j3coulo@awork3.anarazel.de
1 parent 9ddb870 commit 8f12a4e

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

src/backend/Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,7 @@ postgres: $(POSTGRES_IMP)
101101

102102
$(POSTGRES_IMP): $(OBJS)
103103
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(call expand_subsys,$^)
104-
ifeq ($(host_os), aix3.2.5)
105104
$(MKLDEXPORT) SUBSYS.o $(bindir)/postgres > $@
106-
else
107-
ifneq (,$(findstring aix4.1, $(host_os)))
108-
$(MKLDEXPORT) SUBSYS.o $(bindir)/postgres > $@
109-
else
110-
$(MKLDEXPORT) SUBSYS.o . > $@
111-
endif
112-
endif
113105
@rm -f SUBSYS.o
114106

115107
endif # aix

src/makefiles/Makefile.aix

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,9 @@ AROPT = crs
88
# -blibpath must contain ALL directories where we should look for libraries
99
libpath := $(shell echo $(subst -L,:,$(filter -L/%,$(LDFLAGS))) | sed -e's/ //g'):/usr/lib:/lib
1010

11-
ifeq ($(host_os), aix3.2.5)
12-
rpath = -L'$(rpathdir)'
13-
else
14-
rpath = -Wl,-blibpath:'$(rpathdir)$(libpath)'
15-
endif
11+
rpath = -Wl,-blibpath:'$(rpathdir)$(libpath)'
1612

17-
ifeq ($(host_os), aix3.2.5)
18-
ifneq ($(GCC), yes)
19-
LDFLAGS_SL += -e _nostart -H512 -bM:SRE
20-
endif
21-
else
22-
LDFLAGS_SL += -Wl,-bnoentry -Wl,-H512 -Wl,-bM:SRE
23-
endif
13+
LDFLAGS_SL += -Wl,-bnoentry -Wl,-H512 -Wl,-bM:SRE
2414

2515
# env var name to use in place of LD_LIBRARY_PATH
2616
ld_library_path_var = LIBPATH

src/template/aix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
# non-default CFLAGS setting.
77
if test "$GCC" != yes ; then
88
case $host_os in
9-
aix3.2.5 | aix4.1*)
10-
CFLAGS="-O -qmaxmem=16384"
11-
;;
129
*)
1310
CFLAGS="-O2 -qmaxmem=16384"
1411
;;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy