From c7f0d89684104921cae696f3272a8ab762a8d6c8 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Thu, 1 Mar 2012 17:06:37 -0800 Subject: [PATCH] remove HAL_MODULE_INFO_SYM const HAL_MODULE_INFO_SYM was declared as read-only, but the struct is written to by libhardware. This causes a segfault when -Wl,-z,relro is enabled. Fixed. Change-Id: I3a3e8366bc2468aef75a3480edd0b3e8fcfeafa5 --- tools/emulator/system/gps/gps_qemu.c | 2 +- tools/emulator/system/lights/lights_qemu.c | 2 +- tools/emulator/system/sensors/sensors_qemu.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/emulator/system/gps/gps_qemu.c b/tools/emulator/system/gps/gps_qemu.c index 78e0bf25a..eebe8d691 100644 --- a/tools/emulator/system/gps/gps_qemu.c +++ b/tools/emulator/system/gps/gps_qemu.c @@ -930,7 +930,7 @@ static struct hw_module_methods_t gps_module_methods = { .open = open_gps }; -const struct hw_module_t HAL_MODULE_INFO_SYM = { +struct hw_module_t HAL_MODULE_INFO_SYM = { .tag = HARDWARE_MODULE_TAG, .version_major = 1, .version_minor = 0, diff --git a/tools/emulator/system/lights/lights_qemu.c b/tools/emulator/system/lights/lights_qemu.c index 839154aad..94fe8ccb4 100644 --- a/tools/emulator/system/lights/lights_qemu.c +++ b/tools/emulator/system/lights/lights_qemu.c @@ -202,7 +202,7 @@ static struct hw_module_methods_t lights_module_methods = { /* * The emulator lights Module */ -const struct hw_module_t HAL_MODULE_INFO_SYM = { +struct hw_module_t HAL_MODULE_INFO_SYM = { .tag = HARDWARE_MODULE_TAG, .version_major = 1, .version_minor = 0, diff --git a/tools/emulator/system/sensors/sensors_qemu.c b/tools/emulator/system/sensors/sensors_qemu.c index 33fa51613..d2c5aa565 100644 --- a/tools/emulator/system/sensors/sensors_qemu.c +++ b/tools/emulator/system/sensors/sensors_qemu.c @@ -623,7 +623,7 @@ static struct hw_module_methods_t sensors_module_methods = { .open = open_sensors }; -const struct sensors_module_t HAL_MODULE_INFO_SYM = { +struct sensors_module_t HAL_MODULE_INFO_SYM = { .common = { .tag = HARDWARE_MODULE_TAG, .version_major = 1,