mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aix: Remove checks for very old OS versions

Browse Source 
Reviewed-By: Thomas Munro <thomas.munro@gmail.com>
Discussion: https://postgr.es/m/20220807012914.ydz73yte6j3coulo@awork3.anarazel.de
This commit is contained in:
Andres Freund 2022-08-07 09:36:01 -07:00
parent 9ddb870bd4
commit 8f12a4e7ad
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/Makefile
View File

@ -101,15 +101,7 @@ postgres: $(POSTGRES_IMP)
$(POSTGRES_IMP): $(OBJS) $(POSTGRES_IMP): $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(call expand_subsys,$^) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(call expand_subsys,$^)
ifeq ($(host_os), aix3.2.5)
$(MKLDEXPORT) SUBSYS.o $(bindir)/postgres > $@ $(MKLDEXPORT) SUBSYS.o $(bindir)/postgres > $@
else
ifneq (,$(findstring aix4.1, $(host_os)))
$(MKLDEXPORT) SUBSYS.o $(bindir)/postgres > $@
else
$(MKLDEXPORT) SUBSYS.o . > $@
endif
endif
@rm -f SUBSYS.o @rm -f SUBSYS.o
endif # aix endif # aix

14
src/makefiles/Makefile.aix
View File

@ -8,19 +8,9 @@ AROPT = crs
# -blibpath must contain ALL directories where we should look for libraries # -blibpath must contain ALL directories where we should look for libraries
libpath := $(shell echo $(subst -L,:,$(filter -L/%,$(LDFLAGS))) | sed -e's/ //g'):/usr/lib:/lib libpath := $(shell echo $(subst -L,:,$(filter -L/%,$(LDFLAGS))) | sed -e's/ //g'):/usr/lib:/lib
ifeq ($(host_os), aix3.2.5) rpath = -Wl,-blibpath:'$(rpathdir)$(libpath)'
rpath = -L'$(rpathdir)'
else
rpath = -Wl,-blibpath:'$(rpathdir)$(libpath)'
endif
ifeq ($(host_os), aix3.2.5) LDFLAGS_SL += -Wl,-bnoentry -Wl,-H512 -Wl,-bM:SRE
ifneq ($(GCC), yes)
LDFLAGS_SL += -e _nostart -H512 -bM:SRE
endif
else
LDFLAGS_SL += -Wl,-bnoentry -Wl,-H512 -Wl,-bM:SRE
endif
# env var name to use in place of LD_LIBRARY_PATH # env var name to use in place of LD_LIBRARY_PATH
ld_library_path_var = LIBPATH ld_library_path_var = LIBPATH

3
src/template/aix
View File

@ -6,9 +6,6 @@
# non-default CFLAGS setting. # non-default CFLAGS setting.
if test "$GCC" != yes ; then if test "$GCC" != yes ; then
case $host_os in case $host_os in
aix3.2.5 | aix4.1*)
CFLAGS="-O -qmaxmem=16384"
;;
*) *)
CFLAGS="-O2 -qmaxmem=16384" CFLAGS="-O2 -qmaxmem=16384"
;; ;;