diff options
| author | Michael Forney <mforney@mforney.org> | 2020-08-14 01:05:20 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-08-14 01:07:03 -0700 |
| commit | a21a4bbf9605e7b87dc65cbfb859f3ddc7147a58 (patch) | |
| tree | b6af7d141d72ca8d7d54904a843c49fbf467b1ca | |
| parent | f345b8be04d5f5be102bbd83597a640a4151c448 (diff) | |
binutils: Disable libctf
| -rw-r--r-- | pkg/binutils/README.md | 1 | ||||
| -rw-r--r-- | pkg/binutils/binutils/config.h | 2 | ||||
| -rw-r--r-- | pkg/binutils/gen.lua | 23 | ||||
| -rw-r--r-- | pkg/binutils/ld/config.h | 2 |
4 files changed, 3 insertions, 25 deletions
diff --git a/pkg/binutils/README.md b/pkg/binutils/README.md index 2c7c3a40..18edefdc 100644 --- a/pkg/binutils/README.md +++ b/pkg/binutils/README.md @@ -6,6 +6,7 @@ Generated with ./configure \ --target=x86_64-linux-musl \ --disable-gold \ + --disable-libctf \ --disable-nls \ --disable-plugins \ --enable-default-hash-style=gnu \ diff --git a/pkg/binutils/binutils/config.h b/pkg/binutils/binutils/config.h index 640d0f3f..1eb58514 100644 --- a/pkg/binutils/binutils/config.h +++ b/pkg/binutils/binutils/config.h @@ -6,7 +6,7 @@ /* #undef C_ALLOCA */ #define DEFAULT_AR_DETERMINISTIC 1 #define DEFAULT_STRINGS_ALL 1 -#define ENABLE_LIBCTF 1 +/* #undef ENABLE_LIBCTF */ /* #undef ENABLE_NLS */ #define EXECUTABLE_SUFFIX "" #define HAVE_ALLOCA 1 diff --git a/pkg/binutils/gen.lua b/pkg/binutils/gen.lua index dd527333..aadbf93b 100644 --- a/pkg/binutils/gen.lua +++ b/pkg/binutils/gen.lua @@ -30,7 +30,6 @@ sub('libiberty.ninja', function() regex.c cplus-dem.c cp-demangle.c md5.c sha1.c alloca.c argv.c - bsearch_r.c choose-temp.c concat.c cp-demint.c crc32.c d-demangle.c dwarfnames.c dyn-string.c @@ -63,26 +62,6 @@ sub('libiberty.ninja', function() )]]) end) -sub('libctf.ninja', function() - cflags{ - '-I $dir/libctf', - '-I $srcdir/libctf', - } - -- src/libctf/Makefile.am:/^libctf_nobfd_la_SOURCES - lib('libctf.a', [[ - libctf/( - ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c - ctf-hash.c ctf-labels.c ctf-link.c ctf-lookup.c ctf-open.c - ctf-string.c ctf-subr.c ctf-types.c ctf-util.c - ctf-qsort_r.c - - ctf-open-bfd.c - ) - libiberty.a - $builddir/pkg/zlib/libz.a - ]]) -end) - sub('bfd.ninja', function() cflags{'-I $dir/bfd'} build('sed', '$outdir/bfd/bfd.h', '$srcdir/bfd/bfd-in2.h', {expr={ @@ -215,7 +194,6 @@ sub('binutils.ninja', function() dwarf.c ) libbfd.a.d - libctf.a.d libiberty.a ]]) @@ -355,7 +333,6 @@ sub('ld.ninja', function() ldelf.c ldelfgen.c ) libbfd.a.d - libctf.a.d ]], srcs, }, deps) diff --git a/pkg/binutils/ld/config.h b/pkg/binutils/ld/config.h index 8f11d943..d005289e 100644 --- a/pkg/binutils/ld/config.h +++ b/pkg/binutils/ld/config.h @@ -10,7 +10,7 @@ #define DEFAULT_LD_Z_RELRO 1 #define DEFAULT_LD_Z_SEPARATE_CODE 1 #define DEFAULT_NEW_DTAGS 1 -#define ENABLE_LIBCTF 1 +/* #undef ENABLE_LIBCTF */ /* #undef ENABLE_NLS */ /* #undef EXTRA_SHLIB_EXTENSION */ #define GOT_HANDLING_DEFAULT GOT_HANDLING_TARGET_DEFAULT |