From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Michael Osipov" <michael.osipov@siemens.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2] Makefile: remove the NO_R_TO_GCC_LINKER flag
Date: Fri, 17 May 2019 23:58:47 +0200 [thread overview]
Message-ID: <20190517215847.28179-1-avarab@gmail.com> (raw)
In-Reply-To: <xmqqd0ki3s0q.fsf@gitster-ct.c.googlers.com>
Change our default CC_LD_DYNPATH invocation to something GCC likes
these days. Since the GCC 4.6 release unknown flags haven't been
passed through to ld(1). Thus our previous default of CC_LD_DYNPATH=-R
would cause an error on modern GCC unless NO_R_TO_GCC_LINKER was set.
This CC_LD_DYNPATH flag is really obscure, and I don't expect anyone
except those working on git development ever use this.
It's not needed to simply link to libraries like say libpcre,
but *only* for those cases where we're linking to such a library not
present in the OS's library directories. See e.g. ldconfig(8) on Linux
for more details.
I use this to compile my git with a LIBPCREDIR=$HOME/g/pcre2/inst as
I'm building that from source, but someone maintaining an OS package
is almost certainly not going to use this. They're just going to set
USE_LIBPCRE=YesPlease after installing the libpcre dependency,
which'll point to OS libraries which ld(1) will find without the help
of CC_LD_DYNPATH.
Another thing that helps mitigate any potential breakage is that we
detect the right type of invocation in configure.ac, which e.g. HP/UX
uses[1], as does IBM's AIX package[2]. From what I can tell both AIX
and Solaris packagers are building git with GCC, so I'm not adding a
corresponding config.mak.uname default to cater to their OS-native
linkers.
Now for an overview of past development in this area:
Our use of "-R" dates back to 455a7f3275 ("More portability.",
2005-09-30). Soon after that in bbfc63dd78 ("gcc does not necessarily
pass runtime libpath with -R", 2006-12-27) the NO_R_TO_GCC flag was
added, allowing optional use of "-Wl,-rpath=".
Then in f5b904db6b ("Makefile: Allow CC_LD_DYNPATH to be overriden",
2008-08-16) the ability to override this flag to something else
entirely was added, as some linkers use neither "-Wl,-rpath," nor
"-R".
From what I can tell we should, with the benefit of hindsight, have
made this change back in 2006. GCC & ld supported this type of
invocation back then, or since at least binutils-gdb.git's[3]
a1ad915dc4 ("[...]Add support for -rpath[...]", 1994-07-20).
Further reading and prior art can be found at [4][5][6][7]. Making a
plain "-R" an error seems from reading those reports to have been
introduced in GCC 4.6 released on March 25, 2011[8], but I couldn't
confirm this with absolute certainty, its release notes are ambiguous
on the subject, and I couldn't be bothered to try to build & bisect it
against GCC 4.5.
1. https://public-inbox.org/git/20190516093412.14795-1-avarab@gmail.com/
2. https://www.ibm.com/developerworks/aix/library/aix-toolbox/alpha.html
3. git://sourceware.org/git/binutils-gdb.git
4. https://github.com/tsuna/boost.m4/issues/15
5. https://bugzilla.gnome.org/show_bug.cgi?id=641416
6. https://stackoverflow.com/questions/12629042/g-4-6-real-error-unrecognized-option-r
7. https://curl.haxx.se/mail/archive-2014-11/0005.html
8. https://gcc.gnu.org/gcc-4.6/changes.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
On Fri, May 17 2019, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
>> Far be it from me to care about AIX, but it seems like this is ripe for
>> regressions, because we don't know which platforms were relying on "-R"
>> instead of "-Wl,-rpath", and now everybody will be using the latter by
>> default.
>
> I do not have a stake in AIX, either, but I had the same reaction.
I did a bad job of summarizing why this change makes sense. Here's a
v2 with a changed commit message. The first 4 pargaraphs are most
relevant.
Range-diff:
1: bd9558b1cf ! 1: 56abcd0fae Makefile: remove the NO_R_TO_GCC_LINKER flag
@@ -2,13 +2,34 @@
Makefile: remove the NO_R_TO_GCC_LINKER flag
- Remove the NO_R_TO_GCC_LINKER flag, thus switching the default to
- "-Wl,-rpath,$LIBPATH" instead of our current "-R$LIBPATH". This is a
- relatively obscure thing that only kicks in when using one of the
- LIBDIR flags, e.g. LIBPCREDIR or CURLDIR.
+ Change our default CC_LD_DYNPATH invocation to something GCC likes
+ these days. Since the GCC 4.6 release unknown flags haven't been
+ passed through to ld(1). Thus our previous default of CC_LD_DYNPATH=-R
+ would cause an error on modern GCC unless NO_R_TO_GCC_LINKER was set.
- How we invoke the linker to do this can still be overridden with
- CC_LD_DYNPATH, as seen in our configure.ac script.
+ This CC_LD_DYNPATH flag is really obscure, and I don't expect anyone
+ except those working on git development ever use this.
+
+ It's not needed to simply link to libraries like say libpcre,
+ but *only* for those cases where we're linking to such a library not
+ present in the OS's library directories. See e.g. ldconfig(8) on Linux
+ for more details.
+
+ I use this to compile my git with a LIBPCREDIR=$HOME/g/pcre2/inst as
+ I'm building that from source, but someone maintaining an OS package
+ is almost certainly not going to use this. They're just going to set
+ USE_LIBPCRE=YesPlease after installing the libpcre dependency,
+ which'll point to OS libraries which ld(1) will find without the help
+ of CC_LD_DYNPATH.
+
+ Another thing that helps mitigate any potential breakage is that we
+ detect the right type of invocation in configure.ac, which e.g. HP/UX
+ uses[1], as does IBM's AIX package[2]. From what I can tell both AIX
+ and Solaris packagers are building git with GCC, so I'm not adding a
+ corresponding config.mak.uname default to cater to their OS-native
+ linkers.
+
+ Now for an overview of past development in this area:
Our use of "-R" dates back to 455a7f3275 ("More portability.",
2005-09-30). Soon after that in bbfc63dd78 ("gcc does not necessarily
@@ -22,32 +43,24 @@
From what I can tell we should, with the benefit of hindsight, have
made this change back in 2006. GCC & ld supported this type of
- invocation back then, or since at least binutils-gdb.git's[1]
- a1ad915dc4 ("[...]Add support for -rpath[...]", 1994-07-20). Most
- people compiling git with a custom LIBDIR are going to be on a GNU-ish
- system, and having to provide this NO_R_TO_GCC_LINKER flag on top of a
- custom LIBDIR is annoying.
-
- There are some OS's that don't support -rpath, e.g. AIX ld just
- supports "-R". Perhaps we should follow this up with some
- config.mak.uname changes, but as noted it's quite possible that nobody
- on these platforms uses this (instead libraries in the system's search
- path). We *could* also use "-Wl,-R", but let's not introduce something
- new.
+ invocation back then, or since at least binutils-gdb.git's[3]
+ a1ad915dc4 ("[...]Add support for -rpath[...]", 1994-07-20).
- Further reading and prior art can be found at [2][3][4][5]. Making a
+ Further reading and prior art can be found at [4][5][6][7]. Making a
plain "-R" an error seems from reading those reports to have been
- introduced in GCC 4.6 released on March 25, 2011, but I couldn't
+ introduced in GCC 4.6 released on March 25, 2011[8], but I couldn't
confirm this with absolute certainty, its release notes are ambiguous
on the subject, and I couldn't be bothered to try to build & bisect it
against GCC 4.5.
- 1. git://sourceware.org/git/binutils-gdb.git
- 2. https://github.com/tsuna/boost.m4/issues/15
- 3. https://bugzilla.gnome.org/show_bug.cgi?id=641416
- 4. https://stackoverflow.com/questions/12629042/g-4-6-real-error-unrecognized-option-r
- 5. https://curl.haxx.se/mail/archive-2014-11/0005.html
- 6. https://gcc.gnu.org/gcc-4.6/changes.html
+ 1. https://public-inbox.org/git/20190516093412.14795-1-avarab@gmail.com/
+ 2. https://www.ibm.com/developerworks/aix/library/aix-toolbox/alpha.html
+ 3. git://sourceware.org/git/binutils-gdb.git
+ 4. https://github.com/tsuna/boost.m4/issues/15
+ 5. https://bugzilla.gnome.org/show_bug.cgi?id=641416
+ 6. https://stackoverflow.com/questions/12629042/g-4-6-real-error-unrecognized-option-r
+ 7. https://curl.haxx.se/mail/archive-2014-11/0005.html
+ 8. https://gcc.gnu.org/gcc-4.6/changes.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Makefile | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index f965509b3c..ce7a489d64 100644
--- a/Makefile
+++ b/Makefile
@@ -265,10 +265,6 @@ all::
#
# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
#
-# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
-# that tells runtime paths to dynamic libraries;
-# "-Wl,-rpath=/path/lib" is used instead.
-#
# Define NO_NORETURN if using buggy versions of gcc 4.6+ and profile feedback,
# as the compiler can crash (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49299)
#
@@ -1160,6 +1156,7 @@ endif
# which'll override these defaults.
CFLAGS = -g -O2 -Wall
LDFLAGS =
+CC_LD_DYNPATH = -Wl,-rpath,
BASIC_CFLAGS = -I.
BASIC_LDFLAGS =
@@ -1287,16 +1284,6 @@ ifeq ($(uname_S),Darwin)
PTHREAD_LIBS =
endif
-ifndef CC_LD_DYNPATH
- ifdef NO_R_TO_GCC_LINKER
- # Some gcc does not accept and pass -R to the linker to specify
- # the runtime dynamic library path.
- CC_LD_DYNPATH = -Wl,-rpath,
- else
- CC_LD_DYNPATH = -R
- endif
-endif
-
ifdef NO_LIBGEN_H
COMPAT_CFLAGS += -DNO_LIBGEN_H
COMPAT_OBJS += compat/basename.o
--
2.21.0.1020.gf2820cf01a
next prev parent reply other threads:[~2019-05-17 21:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-08 10:45 [PATCH] Improving HP-UX support Osipov, Michael
2019-05-09 7:32 ` Ævar Arnfjörð Bjarmason
2019-05-09 8:09 ` Osipov, Michael
2019-05-13 22:17 ` [PATCH] sha1dc: update from upstream Ævar Arnfjörð Bjarmason
2019-05-14 11:17 ` Osipov, Michael
2019-05-15 11:48 ` Ævar Arnfjörð Bjarmason
2019-05-16 7:13 ` Osipov, Michael
2019-05-16 8:31 ` Ævar Arnfjörð Bjarmason
2019-05-16 8:40 ` Osipov, Michael
2019-05-16 9:34 ` [PATCH] configure: Detect linking style for HP aCC on HP-UX Ævar Arnfjörð Bjarmason
2019-05-16 18:05 ` [PATCH] Makefile: remove the NO_R_TO_GCC_LINKER flag Ævar Arnfjörð Bjarmason
2019-05-16 22:25 ` Jeff King
2019-05-16 23:21 ` Junio C Hamano
2019-05-17 0:23 ` Jeff King
2019-05-17 21:58 ` Ævar Arnfjörð Bjarmason [this message]
2019-05-19 0:56 ` [PATCH v2] " Junio C Hamano
2019-05-19 5:01 ` Jeff King
2019-06-07 14:51 ` [PATCH] configure: Detect linking style for HP aCC on HP-UX Osipov, Michael
2019-06-07 17:03 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190517215847.28179-1-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=michael.osipov@siemens.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).