mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-19 04:03:56 +00:00
7869d16545
Also begin to start work on cross compilation, though that will have to
be finished later.
The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.
Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.
----
Other misc notes, highly incomplete
- lvm-config-native and llvm-config are put in `dev` because they are
tools just for build time.
- Clang no longer has an lld dep. That was introduced in
db29857eb3, but if clang needs help
finding lld when it is used we should just pass it flags / put in the
resource dir. Providing it at build time increases critical path
length for no good reason.
----
A note on `nativeCC`:
`stdenv` takes tools from the previous stage, so:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`
while:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
32 lines
864 B
Diff
32 lines
864 B
Diff
--- a/source/Plugins/Process/Linux/Procfs.h
|
|
+++ b/source/Plugins/Process/Linux/Procfs.h
|
|
@@ -11,21 +11,12 @@
|
|
// sys/procfs.h on Android/Linux for all supported architectures.
|
|
|
|
#include <sys/ptrace.h>
|
|
+#include <asm/ptrace.h>
|
|
|
|
-#ifdef __ANDROID__
|
|
-#if defined(__arm64__) || defined(__aarch64__)
|
|
-typedef unsigned long elf_greg_t;
|
|
-typedef elf_greg_t
|
|
- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
|
|
-typedef struct user_fpsimd_state elf_fpregset_t;
|
|
-#ifndef NT_FPREGSET
|
|
-#define NT_FPREGSET NT_PRFPREG
|
|
-#endif // NT_FPREGSET
|
|
-#elif defined(__mips__)
|
|
-#ifndef NT_FPREGSET
|
|
-#define NT_FPREGSET NT_PRFPREG
|
|
-#endif // NT_FPREGSET
|
|
-#endif
|
|
-#else // __ANDROID__
|
|
+#if !defined(__GLIBC__) && defined(__powerpc__)
|
|
+#define pt_regs musl_pt_regs
|
|
+#include <sys/procfs.h>
|
|
+#undef pt_regs
|
|
+#else
|
|
#include <sys/procfs.h>
|
|
-#endif // __ANDROID__
|
|
+#endif
|