From 08d4b1aeda56485c8ae4bbf9f1f0bed94fa968f0 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Wed, 24 Feb 2021 02:57:59 +0000
Subject: [PATCH] aya-gen: add bindgen builder for userspace code

---
 aya-gen/src/bindgen.rs   | 11 ++++++++++-
 aya-gen/src/btf_types.rs |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/aya-gen/src/bindgen.rs b/aya-gen/src/bindgen.rs
index c9e02cad..d8198da9 100644
--- a/aya-gen/src/bindgen.rs
+++ b/aya-gen/src/bindgen.rs
@@ -1,6 +1,15 @@
 use bindgen::{self, Builder, EnumVariation};
 
-pub fn builder() -> Builder {
+pub fn user_builder() -> Builder {
+    let bindgen = bindgen::builder()
+        .layout_tests(false)
+        .default_enum_style(EnumVariation::ModuleConsts)
+        .prepend_enum_name(false);
+
+    bindgen
+}
+
+pub fn bpf_builder() -> Builder {
     let bindgen = bindgen::builder()
         .use_core()
         .ctypes_prefix("::aya_bpf_cty")
diff --git a/aya-gen/src/btf_types.rs b/aya-gen/src/btf_types.rs
index 5ef8c4da..5387ef40 100644
--- a/aya-gen/src/btf_types.rs
+++ b/aya-gen/src/btf_types.rs
@@ -28,7 +28,7 @@ pub fn generate<T: AsRef<str>>(
     types: &[T],
     probe_read_getters: bool,
 ) -> Result<String, Error> {
-    let mut bindgen = bindgen::builder();
+    let mut bindgen = bindgen::bpf_builder();
 
     let c_header = c_header_from_btf(btf_file)?;
     bindgen = bindgen.header_contents("kernel_types.h", &c_header);