Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raspberry pi check for Freeswitch 1.7 #23

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Raspberry pi check for Freeswitch 1.7 #23

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9160013
Check for rpi 3
leonmak Dec 5, 2017
dfc1380
Update Makefile
leonmak Dec 5, 2017
8a694eb
Update Makefile
leonmak Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ PROC?=$(shell uname -m)

CC=gcc
CFLAGS=-fPIC -O3 -fomit-frame-pointer -fno-exceptions -Wall -std=c99 -pedantic
MODEL=$(cat /proc/device-tree/model)
Copy link
Owner

@xadhoom xadhoom Dec 6, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will fail on standard system and no error handling is done

ifeq (${PROC},x86_64)
CFLAGS+=-m64 -mtune=generic
else ifneq (,$(findstring "Raspberry Pi", $(MODEL)))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would check the PROC var, or at least leverage on uname:

pi@raspberrypi:~ $ uname -a
Linux raspberrypi 4.1.19-v7+ #858 SMP Tue Mar 15 15:56:00 GMT 2016 armv7l GNU/Linux

I don't have a rpi now to check what uname -m outputs (basically the value of $PROC), you may want to look at it.

Right now (without your mods), what happens?

Copy link
Author

@leonmak leonmak Dec 7, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gcc: error: unrecognized argument in option ‘-march=i686’
gcc: error: unrecognized command line option ‘-m32’

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok , uname -m return armv7l

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, so please update the PR (and rebase it to have a single commit) and I'll be happy to check it again and merge!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pretty much a duplicate of my pr #19
Adding that specific raspberry pi code is not needed afaik.

Just need to eliminate the usage of m32 etc from non x86 based architectures like arm etc.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@leonmak I just merged @MartB #19 , could you give it a shot and check if this can be closed?

-march=armv7
else
CFLAGS+=-m32 -march=i686
endif
Expand Down