diff options
| author | Vladimir Mezentsev <vladimir.mezentsev@oracle.com> | 2022-07-06 13:52:57 -0700 |
|---|---|---|
| committer | Vladimir Mezentsev <vladimir.mezentsev@oracle.com> | 2022-07-06 22:36:44 -0700 |
| commit | 1bb1f55d648e9c32bbead00afc95761646a6d050 (patch) | |
| tree | 3dc32585ce9e5abe151a32939fda236e9fd83d04 /gprofng | |
| parent | 3d5d6bd55433735c4fc620a47b543065582d06ae (diff) | |
| download | gdb-1bb1f55d648e9c32bbead00afc95761646a6d050.zip gdb-1bb1f55d648e9c32bbead00afc95761646a6d050.tar.gz gdb-1bb1f55d648e9c32bbead00afc95761646a6d050.tar.bz2 | |
gprofng: adjust GPROFNG_VARIANT
GPROFNG_VARIANT depends on compiler options, not on $(host).
gprofng/ChangeLog
2022-07-06 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
PR gprofng/29116
* libcollector/configure.ac: Adjust GPROFNG_VARIANT.
* libcollector/configure: Rebuild.
Diffstat (limited to 'gprofng')
| -rwxr-xr-x | gprofng/libcollector/configure | 23 | ||||
| -rw-r--r-- | gprofng/libcollector/configure.ac | 23 |
2 files changed, 26 insertions, 20 deletions
diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure index 52d9892..cbb2040 100755 --- a/gprofng/libcollector/configure +++ b/gprofng/libcollector/configure @@ -15476,17 +15476,20 @@ $as_echo "$as_me: WARNING: Cannot set --enable-shared for gprofng/libcollector. fi GPROFNG_VARIANT=unknown -case "${host}" in - x86_64-*-linux*) - GPROFNG_VARIANT=amd64-Linux - ;; - i?86-*-linux*) +x=`echo | $CC $CFLAGS -dM -E - | grep -w __x86_64` +if test -n "$x"; then + GPROFNG_VARIANT=amd64-Linux +else + x=`echo | $CC $CFLAGS -dM -E - | grep -w __i386__` + if test -n "$x"; then GPROFNG_VARIANT=intel-Linux - ;; - aarch64-*-linux*) - GPROFNG_VARIANT=aarch64-Linux - ;; -esac + else + x=`echo | $CC $CFLAGS -dM -E - | grep -w __aarch64__` + if test -n "$x"; then + GPROFNG_VARIANT=aarch64-Linux + fi + fi +fi ac_ext=c diff --git a/gprofng/libcollector/configure.ac b/gprofng/libcollector/configure.ac index 2e67e74..d3c6bd5 100644 --- a/gprofng/libcollector/configure.ac +++ b/gprofng/libcollector/configure.ac @@ -42,17 +42,20 @@ if test "$enable_shared" != "yes"; then fi GPROFNG_VARIANT=unknown -case "${host}" in - x86_64-*-linux*) - GPROFNG_VARIANT=amd64-Linux - ;; - i?86-*-linux*) +x=`echo | $CC $CFLAGS -dM -E - | grep -w __x86_64` +if test -n "$x"; then + GPROFNG_VARIANT=amd64-Linux +else + x=`echo | $CC $CFLAGS -dM -E - | grep -w __i386__` + if test -n "$x"; then GPROFNG_VARIANT=intel-Linux - ;; - aarch64-*-linux*) - GPROFNG_VARIANT=aarch64-Linux - ;; -esac + else + x=`echo | $CC $CFLAGS -dM -E - | grep -w __aarch64__` + if test -n "$x"; then + GPROFNG_VARIANT=aarch64-Linux + fi + fi +fi AC_SUBST(GPROFNG_VARIANT) ACX_PROG_CC_WARNING_OPTS([-Wno-nonnull-compare], [GPROFNG_NO_NONNULL_COMPARE_CFLAGS]) |