Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit69ae9dc

Browse files
committed
Ensure link commands list *.o files before LDFLAGS.
It's important for link commands to list *.o input files before -lswitches for libraries, as library code may not get pulled into the linkunless referenced by an earlier command-line entry. This is certainlynecessary for static libraries (.a style). Apparently on some platformsit is also necessary for shared libraries, as reported by Donald Dong.We often put -l switches for within-tree libraries into LDFLAGS, meaningthat link commands that list *.o files after LDFLAGS are hazardous.Most of our link commands got this right, but a few did not. Inparticular, places that relied on gmake's default implicit link rulefailed, because that puts LDFLAGS first. Fix that by overriding thebuilt-in rule with our own. The implicit link rules insrc/makefiles/Makefile.* for single-.o-file shared libraries mostlygot this wrong too, so fix them. I also changed the link rules for thebackend and a couple of other places for consistency, even though theyare not (currently) at risk because they aren't adding any -l switchesto LDFLAGS.Arguably, the real problem here is that we're abusing LDFLAGS byputting -l switches in it and we should stop doing that. But changingthat would be quite invasive, so I'm not eager to do so.Perhaps this is a candidate for back-patching, but so far it seemsthat problems can only be exhibited in test code we don't normallybuild, and at least some of the problems are new in HEAD anyway.So I'll refrain for now.Donald Dong and Tom LaneDiscussion:https://postgr.es/m/CAKABAquXn-BF-vBeRZxhzvPyfMqgGuc74p8BmQZyCFDpyROBJQ@mail.gmail.com
1 parent97c3949 commit69ae9dc

File tree

14 files changed

+26
-22
lines changed

14 files changed

+26
-22
lines changed

‎src/Makefile.global.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,13 @@ endif
742742
# tracking (see below) is used.
743743
%:%.c
744744

745+
# Replace gmake's default rule for linking a single .o file to produce an
746+
# executable. The main point here is to put LDFLAGS after the .o file,
747+
# since we put -l switches into LDFLAGS and those are order-sensitive.
748+
# In addition, include CFLAGS and LDFLAGS_EX per project conventions.
749+
%:%.o
750+
$(CC)$(CFLAGS)$<$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
751+
745752
ifndefPGXS
746753

747754
# Remake Makefile.global from Makefile.global.in if the latter

‎src/backend/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ifneq ($(PORTNAME), win32)
6060
ifneq ($(PORTNAME), aix)
6161

6262
postgres:$(OBJS)
63-
$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX)$(export_dynamic)$(call expand_subsys,$^)$(LIBS) -o$@
63+
$(CC)$(CFLAGS)$(call expand_subsys,$^)$(LDFLAGS)$(LDFLAGS_EX)$(export_dynamic)$(LIBS) -o$@
6464

6565
endif
6666
endif
@@ -69,7 +69,7 @@ endif
6969
ifeq ($(PORTNAME), cygwin)
7070

7171
postgres:$(OBJS)
72-
$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX)$(export_dynamic) -Wl,--stack,$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a$(call expand_subsys,$^)$(LIBS) -o$@
72+
$(CC)$(CFLAGS)$(call expand_subsys,$^)$(LDFLAGS)$(LDFLAGS_EX)$(export_dynamic) -Wl,--stack,$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a$(LIBS) -o$@
7373

7474
# libpostgres.a is actually built in the preceding rule, but we need this to
7575
# ensure it's newer than postgres; see notes in src/backend/parser/Makefile
@@ -82,7 +82,7 @@ ifeq ($(PORTNAME), win32)
8282
LIBS += -lsecur32
8383

8484
postgres:$(OBJS)$(WIN32RES)
85-
$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a$(call expand_subsys,$(OBJS))$(WIN32RES)$(LIBS) -o$@$(X)
85+
$(CC)$(CFLAGS)$(call expand_subsys,$(OBJS))$(WIN32RES)$(LDFLAGS)$(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a$(LIBS) -o$@$(X)
8686

8787
# libpostgres.a is actually built in the preceding rule, but we need this to
8888
# ensure it's newer than postgres; see notes in src/backend/parser/Makefile
@@ -94,7 +94,7 @@ endif # win32
9494
ifeq ($(PORTNAME), aix)
9595

9696
postgres:$(POSTGRES_IMP)
97-
$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX)$(call expand_subsys,$(OBJS)) -Wl,-bE:$(top_builddir)/src/backend/$(POSTGRES_IMP)$(LIBS) -Wl,-brtllib -o$@
97+
$(CC)$(CFLAGS)$(call expand_subsys,$(OBJS))$(LDFLAGS)$(LDFLAGS_EX) -Wl,-bE:$(top_builddir)/src/backend/$(POSTGRES_IMP)$(LIBS) -Wl,-brtllib -o$@
9898

9999
$(POSTGRES_IMP):$(OBJS)
100100
$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(call expand_subsys,$^)
@@ -117,7 +117,7 @@ $(top_builddir)/src/port/libpgport_srv.a: | submake-libpgport
117117
# The postgres.o target is needed by the rule in Makefile.global that
118118
# creates the exports file when MAKE_EXPORTS = true.
119119
postgres.o:$(OBJS)
120-
$(CC)$(LDREL)$(LDFLAGS)$(LDFLAGS_EX)$(call expand_subsys,$^)$(LIBS) -o$@
120+
$(CC)$(LDREL)$(call expand_subsys,$^)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@
121121

122122

123123
# The following targets are specified in make commands that appear in
@@ -319,4 +319,4 @@ maintainer-clean: distclean
319319
# are up to date. It saves the time of doing all the submakes.
320320
.PHONY: quick
321321
quick:$(OBJS)
322-
$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX)$(export_dynamic)$(call expand_subsys,$^)$(LIBS) -o postgres
322+
$(CC)$(CFLAGS)$(call expand_subsys,$^)$(LDFLAGS)$(LDFLAGS_EX)$(export_dynamic)$(LIBS) -o postgres

‎src/interfaces/ecpg/preproc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ endif
3737
all: ecpg
3838

3939
ecpg:$(OBJS) | submake-libpgport
40-
$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX)$^$(LIBS)$(PTHREAD_LIBS) -o$@$(X)
40+
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS)$(PTHREAD_LIBS) -o$@$(X)
4141

4242
# We symlink typename.c from ecpglib and recompile it here
4343
typename.c:% :$(top_srcdir)/src/interfaces/ecpg/ecpglib/%

‎src/interfaces/ecpg/test/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ clean distclean maintainer-clean:
4949
all: pg_regress$(X)
5050

5151
pg_regress$(X): pg_regress_ecpg.o$(WIN32RES)$(top_builddir)/src/test/regress/pg_regress.o
52-
$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX)$^$(LIBS) -o$@
52+
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@
5353

5454
$(top_builddir)/src/test/regress/pg_regress.o:
5555
$(MAKE) -C$(dir$@)$(notdir$@)

‎src/interfaces/ecpg/test/Makefile.regress

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ ECPG_TEST_DEPENDENCIES = ../../preproc/ecpg$(X) \
2121
$(srcdir)/../../include/sqltypes.h \
2222
$(srcdir)/../../include/sql3types.h
2323

24-
%: %.o
25-
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
26-
2724
# Caution: this build rule is overridden in some child Makefiles
2825
# where it's necessary to use nondefault switches to ecpg;
2926
# make sure those rules match except for the extra switches.

‎src/makefiles/Makefile.aix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ MKLDEXPORT=$(top_srcdir)/$(MKLDEXPORT_DIR)/mkldexport.sh
4040

4141
# Rule for building a shared library from a single .o file
4242
%$(DLSUFFIX): %.o %.exp
43-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(BE_DLLLIBS)
43+
$(CC) $(CFLAGS) $*.o $(LDFLAGS) $(LDFLAGS_SL) -o $@ -Wl,-bE:$*.exp $(BE_DLLLIBS)

‎src/makefiles/Makefile.darwin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ endif
1010

1111
# Rule for building a shared library from a single .o file
1212
%.so: %.o
13-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle $(BE_DLLLIBS) -o $@ $<
13+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -bundle $(BE_DLLLIBS) -o $@

‎src/makefiles/Makefile.freebsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CFLAGS_SL = -fPIC -DPIC
1313
# Rule for building a shared library from a single .o file
1414
%.so: %.o
1515
ifdef ELF_SYSTEM
16-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
16+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
1717
else
1818
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
1919
@echo building shared object $@

‎src/makefiles/Makefile.hpux

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ endif
4040
%$(DLSUFFIX): %.o
4141
ifeq ($(GCC), yes)
4242
ifeq ($(with_gnu_ld), yes)
43-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< `$(CC) $(LDFLAGS) -print-libgcc-file-name`
43+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ `$(CC) $(LDFLAGS) -print-libgcc-file-name`
4444
else
4545
$(LD) -b -o $@ $< `$(CC) $(LDFLAGS) -print-libgcc-file-name`
4646
endif
4747
else
4848
ifeq ($(with_gnu_ld), yes)
49-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
49+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
5050
else
5151
$(LD) -b -o $@ $<
5252
endif

‎src/makefiles/Makefile.linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ CFLAGS_SL = -fPIC
1212

1313
# Rule for building a shared library from a single .o file
1414
%.so: %.o
15-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
15+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@

‎src/makefiles/Makefile.netbsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CFLAGS_SL = -fPIC -DPIC
1515
# Rule for building a shared library from a single .o file
1616
%.so: %.o
1717
ifdef ELF_SYSTEM
18-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
18+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
1919
else
2020
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
2121
@echo building shared object $@

‎src/makefiles/Makefile.openbsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CFLAGS_SL = -fPIC -DPIC
1313
# Rule for building a shared library from a single .o file
1414
%.so: %.o
1515
ifdef ELF_SYSTEM
16-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
16+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
1717
else
1818
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
1919
@echo building shared object $@

‎src/makefiles/Makefile.solaris

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ endif
1919
# Rule for building a shared library from a single .o file
2020
%.so: %.o
2121
ifeq ($(GCC), yes)
22-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
22+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
2323
else
24-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $<
24+
$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -G -o $@
2525
endif
2626

2727
sqlmansect = 5sql

‎src/test/thread/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ all: thread_test
1818

1919
thread_test: thread_test.o
2020
# no need for $LIBS, might not be compiled yet
21-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(PTHREAD_LIBS) -o $@
21+
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(PTHREAD_LIBS) -o $@$(X)
2222

2323
cleandistcleanmaintainer-clean:
2424
rm -f thread_test$(X) thread_test.o

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp